2 files changed, 10 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a57c0a6223..a072f49cb8d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (handle_one_xevent): Only call x_check_fullscreen on the
+        first MapNotify.
+
 2009-07-07  Kenichi Handa  <handa@m17n.org>
 
         * character.h (unibyte_has_multibyte_table): Delete extern.
diff --git a/src/xterm.c b/src/xterm.c
index c034faaec2e..8d9a7d3cc0b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6207,6 +6207,11 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
           if (! f->async_iconified)
             SET_FRAME_GARBAGED (f);
 
+          /* Check if fullscreen was specified before we where mapped the
+             first time, i.e. from the command line. */
+          if (!f->output_data.x->has_been_visible)
+            x_check_fullscreen (f);
+
           f->async_visible = 1;
           f->async_iconified = 0;
           f->output_data.x->has_been_visible = 1;
@@ -6223,8 +6228,6 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
                in case this is the second frame.  */
             record_asynch_buffer_change ();
 
-          /* Check if fullscreen was specified before we where mapped. */
-          x_check_fullscreen (f);
 #ifdef USE_GTK
           xg_frame_resized (f, -1, -1);
 #endif