bugfixes

[picodrive.git] / platform / win32 / GenaDrive / Main.cpp

diff --git a/platform/win32/GenaDrive/Main.cpp b/platform/win32/GenaDrive/Main.cpp
index 4fbbf02..724c454 100644 (file)
--- a/platform/win32/GenaDrive/Main.cpp
+++ b/platform/win32/GenaDrive/Main.cpp
@@ -11,6 +11,7 @@ int lock_to_1_1 = 1;
 int MainWidth=720,MainHeight=480;\r
 \r
 static HMENU mdisplay = 0;\r
+static unsigned char *rom_data = NULL;\r
 \r
 static void UpdateRect()\r
 {\r
@@ -24,7 +25,6 @@ static void UpdateRect()
 static void LoadROM(const char *cmdpath)\r
 {\r
   static char rompath[MAX_PATH] = { 0, };\r
-  static unsigned char *rom_data = NULL;\r
   unsigned char *rom_data_new = NULL;\r
   unsigned int rom_size = 0;\r
   pm_file *rom = NULL;\r
@@ -106,7 +106,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd,UINT msg,WPARAM wparam,LPARAM lparam)
             lock_to_1_1=0;\r
             CheckMenuItem(mdisplay, 1104, MF_UNCHECKED);\r
           }\r
-          LoopWait=0;\r
+          if (rom_data != NULL) LoopWait=0;\r
           return 0;\r
         case 1104:\r
           lock_to_1_1=!lock_to_1_1;\r
@@ -181,7 +181,7 @@ static int FrameInit()
   InsertMenu(mmain, -1, MF_BYPOSITION|MF_STRING|MF_POPUP, (UINT_PTR) mfile, "&File");\r
   InsertMenu(mmain, -1, MF_BYPOSITION|MF_STRING|MF_POPUP, (UINT_PTR) mdisplay, "&Display");\r
 //  InsertMenu(mmain, -1, MF_BYPOSITION|MF_STRING|MF_POPUP, 1200, "&Config");\r
-  InsertMenu(mmain, -1, MF_BYPOSITION|MF_STRING|MF_POPUP, 1300, "&About");\r
+  InsertMenu(mmain, -1, MF_BYPOSITION|MF_STRING, 1300, "&About");\r
 \r
   // Create the window:\r
   FrameWnd=CreateWindow(wc.lpszClassName,"PicoDrive " VERSION,style|WS_VISIBLE,\r