Simple fix to prevent null reference error in main JS, see #196

radiant-player · Jun 18, 2014 · 756f721 · 756f721
1 parent bbf3400
commit 756f721
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/radiant-player-mac/AppDelegate.m b/radiant-player-mac/AppDelegate.m
@@ -652,9 +652,13 @@ - (void)webView:(WebView *)webView didClearWindowObject:(WebScriptObject *)windo
 
 - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
 {
+    // Only apply the main script file when the player is ready.
+    if ([[webView mainFrameDocument] querySelector:@"#playerSongInfo"]) {
+        [self evaluateJavaScriptFile:@"main"];
+    }
+
     [self evaluateJavaScriptFile:@"keyboard"];
     [self evaluateJavaScriptFile:@"mouse"];
-    [self evaluateJavaScriptFile:@"main"];
     [self evaluateJavaScriptFile:@"styles"];
 
     // Apply the navigation styles.