#235: Fix for crash on stream start

Author: XITRIX

CMakeLists.txt

@@ -41,7 +41,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${EXTERN_PATH}/cmake")
 project(Moonlight)
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "3")
-set(VERSION_ALTER "1")
+set(VERSION_ALTER "2")
 set(VERSION_BUILD "1")
 set(PACKAGE_NAME "ru.xitrix.Moonlight")
 set(PSN_TITLE_ID  "MNTL00000")

app/include/streaming_view.hpp

@@ -39,7 +39,7 @@ class StreamingView : public brls::Box {
   private:
     Host host;
     AppInfo app;
-    MoonlightSession* session;
+    MoonlightSession* session = nullptr;
     LoadingOverlay* loader = nullptr;
     Box* keyboardHolder = nullptr;
     KeyboardView* keyboard = nullptr;

app/src/streaming/MoonlightSession.cpp

@@ -17,10 +17,9 @@ void MoonlightSession::set_provider(
     m_provider = provider;
 }
 
-MoonlightSession::MoonlightSession(const std::string& address, int app_id, bool is_sunshine) {
+MoonlightSession::MoonlightSession(const std::string& address, int app_id) {
     m_address = address;
     m_app_id = app_id;
-    m_is_sunshine = is_sunshine;
     m_active_session = this;
 
     m_video_decoder = m_provider->video_decoder();
@@ -95,7 +94,7 @@ void MoonlightSession::connection_terminated(int error_code) {
                     m_active_session->m_is_terminated = true;
                 }
             }
-        });
+        }, m_active_session->m_is_sunshine);
         return;
     }
 
@@ -224,7 +223,9 @@ void MoonlightSession::audio_renderer_decode_and_play_sample(
 
 // MARK: MoonlightSession
 
-void MoonlightSession::start(ServerCallback<bool> callback) {
+void MoonlightSession::start(ServerCallback<bool> callback, bool is_sunshine) {
+    m_is_sunshine = is_sunshine;
+
     LiInitializeStreamConfiguration(&m_config);
 
     int h = Settings::instance().resolution();

app/src/streaming/MoonlightSession.hpp

@@ -14,10 +14,10 @@ class MoonlightSession {
     static void
     set_provider(MoonlightSessionDecoderAndRenderProvider* provider);
 
-    MoonlightSession(const std::string& address, int app_id, bool is_sunshine);
+    MoonlightSession(const std::string& address, int app_id);
     ~MoonlightSession();
 
-    void start(ServerCallback<bool> callback);
+    void start(ServerCallback<bool> callback, bool is_sunshine);
     void stop(int terminate_app);
 
     void draw(NVGcontext* vg, int width, int height);
@@ -66,7 +66,7 @@ class MoonlightSession {
 
     std::string m_address;
     int m_app_id;
-    bool m_is_sunshine;
+    bool m_is_sunshine = false;
     STREAM_CONFIGURATION m_config;
     CONNECTION_LISTENER_CALLBACKS m_connection_callbacks;
     DECODER_RENDERER_CALLBACKS m_video_callbacks;

app/src/streaming_view.cpp

@@ -78,21 +78,21 @@ StreamingView::StreamingView(const Host& host, const AppInfo& app) : host(host),
     keyboardHolder->setAlignItems(AlignItems::STRETCH);
     addView(keyboardHolder);
 
+    session = new MoonlightSession(host.address, app.app_id);
+
 #ifdef PLATFORM_TVOS
         updatePreferredDisplayMode(true);
 #endif
 
     ASYNC_RETAIN
     GameStreamClient::instance().connect(
-        host.address, [ASYNC_TOKEN, host, app](GSResult<SERVER_DATA> result) {
+        host.address, [ASYNC_TOKEN](GSResult<SERVER_DATA> result) {
             ASYNC_RELEASE
             if (!result.isSuccess()) {
                 showError(result.error(), [this]() { terminate(false); });
                 return;
             }
 
-            session = new MoonlightSession(host.address, app.app_id, result.value().isSunshine());
-
             ASYNC_RETAIN
             session->start([ASYNC_TOKEN](GSResult<bool> result) {
                 ASYNC_RELEASE
@@ -101,7 +101,7 @@ StreamingView::StreamingView(const Host& host, const AppInfo& app) : host(host),
                 if (!result.isSuccess()) {
                     showError(result.error(), [this]() { terminate(false); });
                 }
-            });
+            }, result.value().isSunshine());
         });
 
     MoonlightInputManager::instance().reloadButtonMappingLayout();
@@ -281,8 +281,6 @@ void StreamingView::onFocusLost() {
 
 void StreamingView::draw(NVGcontext* vg, float x, float y, float width,
                          float height, Style style, FrameContext* ctx) {
-    if (!session) return;
-    
     if (session->is_terminated()) {
         terminate(false);
         return;
@@ -555,9 +553,6 @@ StreamingView::~StreamingView() {
         ->getInputManager()
         ->getKeyboardKeyStateChanged()
         ->unsubscribe(keysSubscription);
-    
-    if (session) {
-        session->stop(false);
-        delete session;
-    }
+    session->stop(false);
+    delete session;
 }