Fix win32 startup crashes due to restructured PDCurses initialization

logic.
This commit is contained in:
casey langen 2020-08-31 22:33:28 -07:00
parent 0ce8f1ee98
commit 9fa3f521ac

View File

@ -153,8 +153,8 @@ void App::InitCurses() {
PDC_set_function_key(FUNCTION_KEY_SHUT_DOWN, 4); PDC_set_function_key(FUNCTION_KEY_SHUT_DOWN, 4);
#ifdef PDCURSES_WINGUI #ifdef PDCURSES_WINGUI
PDC_set_default_menu_visibility(0); PDC_set_default_menu_visibility(0);
PDC_set_title(this->appTitle.c_str());
PDC_set_color_intensify_enabled(false); PDC_set_color_intensify_enabled(false);
this->SetTitle(this->appTitle);
#endif #endif
#endif #endif
@ -187,6 +187,8 @@ void App::InitCurses() {
} }
this->initialized = true; this->initialized = true;
this->SetTitle(this->appTitle);
} }
void App::SetKeyHandler(KeyHandler handler) { void App::SetKeyHandler(KeyHandler handler) {
@ -267,6 +269,9 @@ void App::SetDefaultMenuVisibility(bool visible) {
void App::SetTitle(const std::string& title) { void App::SetTitle(const std::string& title) {
this->appTitle = title; this->appTitle = title;
if (!initialized) {
return;
}
#ifdef WIN32 #ifdef WIN32
PDC_set_title(this->appTitle.c_str()); PDC_set_title(this->appTitle.c_str());
win32::SetAppTitle(this->appTitle); win32::SetAppTitle(this->appTitle);