diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2022-08-06 02:27:37 -0400 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2022-08-06 02:27:37 -0400 |
| commit | 86fc8f418675af6c8930a9009c7201a4f29a2497 (patch) | |
| tree | 8eef8d7aa30ffe6f2b0e3191b61e7d932b3d7431 /src/abaddon.cpp | |
| parent | e8260c164fd7e49ee9f43da334f332b5a9ec2a0b (diff) | |
| parent | acb80da387b001b65d7f25c7eca5a2ccd7e208b4 (diff) | |
| download | abaddon-portaudio-86fc8f418675af6c8930a9009c7201a4f29a2497.tar.gz abaddon-portaudio-86fc8f418675af6c8930a9009c7201a4f29a2497.zip | |
Merge branch 'master' into attachments
Diffstat (limited to 'src/abaddon.cpp')
| -rw-r--r-- | src/abaddon.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/abaddon.cpp b/src/abaddon.cpp index a34f444..ce3bdb3 100644 --- a/src/abaddon.cpp +++ b/src/abaddon.cpp @@ -544,7 +544,7 @@ void Abaddon::LoadState() { #ifdef WITH_LIBHANDY m_main_window->GetChatWindow()->UseTabsState(state.Tabs); #endif - ActionChannelOpened(state.ActiveChannel); + ActionChannelOpened(state.ActiveChannel, false); } catch (const std::exception &e) { printf("failed to load application state: %s\n", e.what()); } @@ -913,11 +913,15 @@ int main(int argc, char **argv) { char *systemLocale = std::setlocale(LC_ALL, ""); try { - std::locale::global(std::locale(systemLocale)); + if (systemLocale != nullptr) { + std::locale::global(std::locale(systemLocale)); + } } catch (...) { try { std::locale::global(std::locale::classic()); - std::setlocale(LC_ALL, systemLocale); + if (systemLocale != nullptr) { + std::setlocale(LC_ALL, systemLocale); + } } catch (...) {} } |