From a61a630ee675e18f12e8725cca731cbe8aa429ce Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Wed, 3 Aug 2022 02:27:43 -0400
Subject: handle null from std::locale::locale (fixes #88)

---
 src/abaddon.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/abaddon.cpp')

diff --git a/src/abaddon.cpp b/src/abaddon.cpp
index 2e8ecaa..c849fd6 100644
--- a/src/abaddon.cpp
+++ b/src/abaddon.cpp
@@ -898,11 +898,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 (...) {}
     }
 
-- 
cgit v1.2.3


From d99d8443ee8cd06caee2e1daa7c0efa93085c200 Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Sat, 6 Aug 2022 02:23:08 -0400
Subject: dont override expansion state because of active channel

---
 src/abaddon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/abaddon.cpp')

diff --git a/src/abaddon.cpp b/src/abaddon.cpp
index c849fd6..14e43af 100644
--- a/src/abaddon.cpp
+++ b/src/abaddon.cpp
@@ -543,7 +543,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());
     }
-- 
cgit v1.2.3