@@ -1596,10 +1596,6 @@ private void UnsubscribeWebSocketEvents() {
15961596 }
15971597
15981598 private void CleanupWebSocketListener ( ) {
1599- if ( wsListener == null ) {
1600- return ;
1601- }
1602-
16031599 AirConsoleLogger . LogDevelopment ( ( ) => "Cleaning up WebSocket listener" ) ;
16041600
16051601 // Unsubscribe all event handlers to prevent stale events
@@ -1608,14 +1604,24 @@ private void CleanupWebSocketListener() {
16081604 // Stop websocket server if in editor
16091605 StopWebsocketServer ( ) ;
16101606
1611- wsListener = null ;
1607+ if ( wsListener != null ) {
1608+ wsListener = null ;
1609+ }
16121610
16131611 AirConsoleLogger . LogDevelopment ( ( ) => "WebSocket listener cleanup complete" ) ;
16141612 }
16151613
16161614 private void RecreateWebView ( ) {
16171615 if ( string . IsNullOrEmpty ( _webViewOriginalUrl ) || string . IsNullOrEmpty ( _webViewConnectionUrl ) ) {
1618- AirConsoleLogger . LogDevelopment ( ( ) => "Cannot recreate webview - no URL stored" ) ;
1616+ string missing = "" ;
1617+ if ( string . IsNullOrEmpty ( _webViewOriginalUrl ) && string . IsNullOrEmpty ( _webViewConnectionUrl ) ) {
1618+ missing = "both original and connection URLs" ;
1619+ } else if ( string . IsNullOrEmpty ( _webViewOriginalUrl ) ) {
1620+ missing = "original URL" ;
1621+ } else {
1622+ missing = "connection URL" ;
1623+ }
1624+ AirConsoleLogger . LogDevelopment ( ( ) => $ "Cannot recreate webview - missing { missing } ") ;
16191625 return ;
16201626 }
16211627
@@ -2083,13 +2089,14 @@ private void CreateAndroidWebview(string connectionUrl) {
20832089 cookies => AirConsoleLogger . LogDevelopment ( ( ) => $ "AirConsole WebView cookies: { cookies } ") ,
20842090 true , false ) ;
20852091
2086- #if UNITY_ANDROID
2087- string urlOverride = AndroidIntentUtils . GetIntentExtraString ( "base_url" , string . Empty ) ;
2088- string url = ! string . IsNullOrEmpty ( urlOverride ) ? urlOverride : Settings . AIRCONSOLE_BASE_URL ;
2089- AirConsoleLogger . LogDevelopment ( ( ) => $ "BaseURL Override: { urlOverride } ") ;
2090- #else
2091- string url = Settings . AIRCONSOLE_BASE_URL ;
2092- #endif
2092+ string url ;
2093+ if ( IsAndroidRuntime ) {
2094+ string urlOverride = AndroidIntentUtils . GetIntentExtraString ( "base_url" , string . Empty ) ;
2095+ url = ! string . IsNullOrEmpty ( urlOverride ) ? urlOverride : Settings . AIRCONSOLE_BASE_URL ;
2096+ AirConsoleLogger . LogDevelopment ( ( ) => $ "BaseURL Override: { urlOverride } ") ;
2097+ } else {
2098+ url = Settings . AIRCONSOLE_BASE_URL ;
2099+ }
20932100
20942101 url += connectionUrl ;
20952102 if ( IsAndroidRuntime ) {
0 commit comments