=== modified file 'src/native-state-wayland.cpp'
--- src/native-state-wayland.cpp	2013-04-04 16:53:33 +0000
+++ src/native-state-wayland.cpp	2013-04-19 19:51:22 +0000
@@ -116,13 +116,17 @@
 
 void
 NativeStateWayland::output_handle_mode(void *data, struct wl_output * /*wl_output*/,
-                                       uint32_t /*flags*/, int32_t width, int32_t height,
+                                       uint32_t flags, int32_t width, int32_t height,
                                        int32_t refresh)
 {
-    struct my_output *my_output = static_cast<struct my_output *>(data);
-    my_output->width = width;
-    my_output->height = height;
-    my_output->refresh = refresh;
+    /* Only handle output mode events for the shell's "current" mode */
+    if (flags & WL_OUTPUT_MODE_CURRENT) {
+        struct my_output *my_output = static_cast<struct my_output *>(data);
+
+        my_output->width = width;
+        my_output->height = height;
+        my_output->refresh = refresh;
+    }
 }
 
 void