Fix El Capitan errors and crashes

radiant-player · Sep 14, 2015 · a858abd · a858abd
1 parent 864956a
commit a858abd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/radiant-player-mac/AppDelegate.m b/radiant-player-mac/AppDelegate.m
@@ -998,7 +998,7 @@ - (void) evaluateJavaScriptFile:(NSString *)name
         @"if (document.querySelector('#rp-script-%1$@') == null) {"
         "    var js = document.createElement('script');"
         "    js.id = 'rp-script-%1$@';"
-        "    js.src = 'http://radiant-player-mac/js/%1$@.js';"
+        "    js.src = 'https://radiant-player-mac/js/%1$@.js';"
         "    document.head.appendChild(js);"
         "}";
     NSString *insert = [NSString stringWithFormat:template, name];

diff --git a/radiant-player-mac/Popup/PopupView.h b/radiant-player-mac/Popup/PopupView.h
@@ -22,7 +22,6 @@
 @class PopupViewDelegate;
 
 @interface PopupView : VisualEffectView {
-    NSImage *_backgroundImage;
 //    NSView *_backgroundView;
     CGFloat _hoverAlphaMultiplier;
 }

diff --git a/radiant-player-mac/Popup/PopupView.m b/radiant-player-mac/Popup/PopupView.m
@@ -20,8 +20,8 @@ @implementation PopupView
 
 @synthesize isLargePlayer;
 @synthesize trackingArea;
-@synthesize backgroundImage = _backgroundImage;
-@synthesize hoverAlphaMultiplier = _hoverAlphaMultiplier;
+@synthesize backgroundImage;
+@synthesize hoverAlphaMultiplier;
 
 @synthesize arrowX;
 
@@ -77,13 +77,13 @@ - (void)drawRect:(NSRect)dirtyRect
     // Draw the background album art image if possible.
     if (isLargePlayer)
     {
-        if (_backgroundImage != nil)
+        if (backgroundImage != nil)
         {
             [path addClip];
-            [_backgroundImage drawInRect:[self bounds]
-                                fromRect:NSMakeRect(0, 0, _backgroundImage.size.width, _backgroundImage.size.height)
-                               operation:NSCompositeSourceOver
-                                fraction:1.0];
+            [backgroundImage drawInRect:[self bounds]
+                               fromRect:NSMakeRect(0, 0, backgroundImage.size.width, backgroundImage.size.height)
+                              operation:NSCompositeSourceOver
+                               fraction:1.0];
         }
 
         [hoverGradient drawInBezierPath:path angle:-90.0];