Resize window only if the emulator is running

purplemarshmallow · Jun 6, 2015 · e78b03d · e78b03d
1 parent 16bfec3
commit e78b03d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Source/lemd3d/LemNemu.cpp b/Source/lemd3d/LemNemu.cpp
@@ -359,9 +359,11 @@ LRESULT CALLBACK DlgProcSettings(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 	case WM_COMMAND:
 		if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL){
 			EndDialog(hWnd, LOWORD(wParam));
-			FreeDirect3D();
-			InitializeDirect3D();
-			ResizeWindow();
+			if(g_pd3dDevice){
+				FreeDirect3D();
+				InitializeDirect3D();
+				ResizeWindow();
+			}
 			return TRUE;
 		}
 

diff --git a/Source/lemd3d/LemNemu.rc b/Source/lemd3d/LemNemu.rc
@@ -53,7 +53,7 @@ BEGIN
     CONTROL         "Force Z Buffer",IDC_CHKFORCEZBUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,168,88,8
     CONTROL         "Wireframe mode",IDC_WIREFRAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,84,74,9
     COMBOBOX        IDC_WINDOWEDRES,84,214,71,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "windowed resolution",IDC_STATIC,11,216,73,13
+    LTEXT           "windowed resolution",IDC_STATIC,11,216,70,13
     CONTROL         "Force Buffer Clear",IDC_CHKBUFFERCLEAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,191,88,8
     CONTROL         "Disable pixel shader (requires LemD3DCombine.dat)",IDC_DISABLEPIXELSHADER,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,202,191,8