Minor merge fix

mRemoteNG · Nov 12, 2015 · b06d12a · b06d12a
1 parent b63a1d0
commit b06d12a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/WINDOWS/WINDOW.C b/WINDOWS/WINDOW.C
@@ -712,17 +712,17 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	    exwinmode |= WS_EX_TOPMOST;
 	if (conf_get_int(conf, CONF_sunken_edge))
 	    exwinmode |= WS_EX_CLIENTEDGE;
+	hwnd = CreateWindowExW(exwinmode, uappname, uappname,
+                               winmode, CW_USEDEFAULT, CW_USEDEFAULT,
+                               guess_width, guess_height,
+                               NULL, NULL, inst, NULL);
 #ifdef PUTTYNG
 	if (hwnd_parent != 0)
 	{
 	    SetParent(hwnd, (HWND)hwnd_parent); // Focus doesn't work correctly if this is passed into CreateWindow, so set it separately.
 	    hwnd_parent_main = GetAncestor((HWND)hwnd_parent, GA_ROOTOWNER); // the top level ancestor of hwnd_parent
 	}
 #endif // PUTTYNG
-	hwnd = CreateWindowExW(exwinmode, uappname, uappname,
-                               winmode, CW_USEDEFAULT, CW_USEDEFAULT,
-                               guess_width, guess_height,
-                               NULL, NULL, inst, NULL);
         sfree(uappname);
     }