[UI][Qt][WIN32] Fix crash on startup (maybe true) caused by (´∀｀)＜ぬるぽ ヽ(・∀・)ノ┌┛ガッΣ...

diff --git a/source/src/common.cpp b/source/src/common.cpp
index 2bc53d8..624dd9f 100644 (file)
--- a/source/src/common.cpp
+++ b/source/src/common.cpp
@@ -261,7 +261,7 @@ static std::string MyGetPrivateProfileStr(const _TCHAR *lpAppName, const _TCHAR
                delete pf;
                return got_str;
        }
-       csp_logger->debug_log(CSP_LOG_DEBUG, CSP_LOG_TYPE_GENERAL, "Try App: %s Key: %s", lpAppName, lpKeyName);
+       //csp_logger->debug_log(CSP_LOG_DEBUG, CSP_LOG_TYPE_GENERAL, "Try App: %s Key: %s", lpAppName, lpKeyName);
        pf->Fseek(0, FILEIO_SEEK_SET);
        do {
                key_str = key;
@@ -292,7 +292,7 @@ static std::string MyGetPrivateProfileStr(const _TCHAR *lpAppName, const _TCHAR
        delete pf;
        
        got_str.erase(0, pos + key_str.length());
-       csp_logger->debug_log(CSP_LOG_DEBUG, CSP_LOG_TYPE_GENERAL, "Got: %s Length: %d", got_str.c_str(), got_str.length());
+       //csp_logger->debug_log(CSP_LOG_DEBUG, CSP_LOG_TYPE_GENERAL, "Got: %s Length: %d", got_str.c_str(), got_str.length());
        return got_str;
 }
 
@@ -330,7 +330,7 @@ DWORD DLL_PREFIX MyGetPrivateProfileString(LPCTSTR lpAppName, LPCTSTR lpKeyName,
                fio->Fclose();
        }
        delete fio;
-       csp_logger->debug_log(CSP_LOG_DEBUG, CSP_LOG_TYPE_GENERAL, "Try App: %s Key: %s", lpAppName, lpKeyName);
+       //csp_logger->debug_log(CSP_LOG_DEBUG, CSP_LOG_TYPE_GENERAL, "Try App: %s Key: %s", lpAppName, lpKeyName);
        return strlen(lpp);
 }
 

diff --git a/source/src/qt/common/qt_utils.cpp b/source/src/qt/common/qt_utils.cpp
index d380a4e..feb61ef 100644 (file)
--- a/source/src/qt/common/qt_utils.cpp
+++ b/source/src/qt/common/qt_utils.cpp
@@ -583,20 +583,20 @@ int MainLoop(int argc, char *argv[], config_t *cfg)
        load_config(create_local_path(_T("%s.ini"), _T(CONFIG_NAME)));
        
        USING_FLAGS *using_flags = new USING_FLAGS(cfg);
+       // initialize emulation core
        rMainWindow = new META_MainWindow(using_flags);
        rMainWindow->connect(rMainWindow, SIGNAL(sig_quit_all(void)), rMainWindow, SLOT(deleteLater(void)));
        rMainWindow->setCoreApplication(GuiMain);
-       
-       csp_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_GENERAL, "InitInstance() OK.");
-  
-       // disable ime
-       
-       // initialize emulation core
        rMainWindow->getWindow()->show();
+       
        emu = new EMU(rMainWindow, rMainWindow->getGraphicsView(), using_flags);
        using_flags->set_emu(emu);
        using_flags->set_osd(emu->get_osd());
        csp_logger->set_osd(emu->get_osd());
+       csp_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_GENERAL, "InitInstance() OK.");
+       
+       rMainWindow->retranselateUi_Depended_OSD();
+
        QObject::connect(emu->get_osd(), SIGNAL(sig_update_device_node_name(int, const _TCHAR *)),
                                         rMainWindow, SLOT(do_update_device_node_name(int, const _TCHAR *)));
        for(int i = 0; i < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1); i++) {

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index a68a19b..1194b2c 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -153,8 +153,8 @@ target_link_libraries(CSPgui PUBLIC
          )
 
 set_target_properties(CSPgui PROPERTIES 
-                            SOVERSION 2.2.1
-                            VERSION 2.2.1
+                            SOVERSION 2.2.2
+                            VERSION 2.2.2
                             )
 INSTALL(TARGETS CSPgui DESTINATION ${LIBCSP_INSTALL_DIR})
 endif()

diff --git a/source/src/qt/gui/mainwidget_base.h b/source/src/qt/gui/mainwidget_base.h
index 0575191..41d081b 100644 (file)
--- a/source/src/qt/gui/mainwidget_base.h
+++ b/source/src/qt/gui/mainwidget_base.h
@@ -415,6 +415,7 @@ public:
        virtual void retranslateCartMenu(int drv, int basedrv);
        virtual void retranslateVolumeLabels(Ui_SoundDialog *);
        virtual void retranslateEmulatorMenu(void);
+       virtual void retranselateUi_Depended_OSD(void);
        // About Status bar
        virtual void initStatusBar(void);
        // EmuThread

diff --git a/source/src/qt/gui/menu_main.cpp b/source/src/qt/gui/menu_main.cpp
index 2716540..f9b9093 100644 (file)
--- a/source/src/qt/gui/menu_main.cpp
+++ b/source/src/qt/gui/menu_main.cpp
@@ -539,11 +539,12 @@ void Ui_MainWindowBase::setupUi(void)
 void Ui_MainWindowBase::retranslateEmulatorMenu(void)
 {
        int i;
-       menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
        if(using_flags->is_use_joystick()) {
                action_SetupJoystick->setText(QApplication::translate("MainWindow", "Configure Joysticks", 0));
                action_SetupJoystick->setIcon(QIcon(":/icon_gamepad.png"));
        }
+       
+       menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
        action_SetupKeyboard->setText(QApplication::translate("MainWindow", "Configure Keyboard", 0));
        action_SetupKeyboard->setIcon(QIcon(":/icon_keyboard.png"));
        action_SetupMovie->setText(QApplication::translate("MainWindow", "Configure movie encoding", 0));
@@ -551,15 +552,20 @@ void Ui_MainWindowBase::retranslateEmulatorMenu(void)
        action_LogToConsole->setText(QApplication::translate("MainWindow", "Log to Console", 0));
        action_LogToSyslog->setText(QApplication::translate("MainWindow", "Log to Syslog", 0));
        //action_LogRecord->setText(QApplication::translate("MainWindow", "Recording Log", 0));
+       
+       menuDevLogToConsole->setTitle(QApplication::translate("MainWindow", "Per Device", 0));
+
+       action_LogView->setText(QApplication::translate("MainWindow", "View Log", 0));
+       
+}
+
+void Ui_MainWindowBase::retranselateUi_Depended_OSD(void)
+{
        for(int i=0; i < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1) ; i++) {
                const _TCHAR *p;
                p = using_flags->get_vm_node_name(i);
                do_update_device_node_name(i, p);
        }
-       menuDevLogToConsole->setTitle(QApplication::translate("MainWindow", "Per Device", 0));
-
-       action_LogView->setText(QApplication::translate("MainWindow", "View Log", 0));
-       
 }
 
 void Ui_MainWindowBase::CreateEmulatorMenu(void)