osx: Fix segfault at GetPhone (#60)

GetPhone() handle nullptr of httpServer, before init of config
voiceip · May 30, 2022 · e81cc56 · e81cc56
1 parent f7699c7
commit e81cc56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj
@@ -620,7 +620,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"../lib/statsd-cpp/build-osx/lib",
 					"$(inherited)",
-					"/usr/local/opt/opencore-amr/lib",
+					/usr/local/homebrew/lib/,
 					/usr/local/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;

diff --git a/tinyphone/baseapp.cpp b/tinyphone/baseapp.cpp
@@ -190,7 +190,10 @@ namespace tp {
     }
 
     TinyPhone* GetPhone(){
-        return tp::tpHttpServer->tinyPhone;
+        if (tp::tpHttpServer != nullptr)
+            return tp::tpHttpServer->tinyPhone;
+        else
+            return nullptr;
     }