# HG changeset patch
# User Grumpy7
# Date 1382682166 25200
# Node ID c193d289f0a5b0f6d54ca8e339c8c26961eb6a8e
# Parent  e8d329651a2aadfcd33b99a14dc78869c8f898e5# Parent  b0d96beedc80404b004d368e14380054b2288f58
Merge

diff -r b0d96beedc80 -r c193d289f0a5 GUIWindow.cpp
--- a/GUIWindow.cpp	Thu Oct 24 15:40:38 2013 +0600
+++ b/GUIWindow.cpp	Thu Oct 24 23:22:46 2013 -0700
@@ -342,6 +342,8 @@
         pIcons_LOD->SyncLoadedFilesCount();
         pCurrentScreen = pMainScreenNum;
 		}
+  case WINDOW_null:
+    return;
 	default:
 		{
 		break;