diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj index 60becce..1c9ff3d 100644 --- 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 index 83fce6d..8f5eaeb 100644 --- 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; }