snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent crash on resetting background when original isn't cached

This commit is contained in:
Vinyl Darkscratch 2018-03-01 16:18:40 -08:00
parent 7ae32c6717
commit 4214b0e901
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mac-desktop.mm
View File

@ -10,6 +10,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
NSBool isCached = NO;
NSURL *originalBackground; NSURL *originalBackground;
NSDictionary<NSWorkspaceDesktopImageOptionKey, id> *originalOptions; NSDictionary<NSWorkspaceDesktopImageOptionKey, id> *originalOptions;
@ -19,6 +20,7 @@ NSWorkspace *sharedworkspace = [NSWorkspace sharedWorkspace];
void MacDesktop::CacheCurrentBackground() { void MacDesktop::CacheCurrentBackground() {
originalBackground = [sharedworkspace desktopImageURLForScreen:mainscreen]; originalBackground = [sharedworkspace desktopImageURLForScreen:mainscreen];
originalOptions = [sharedworkspace desktopImageOptionsForScreen:mainscreen]; originalOptions = [sharedworkspace desktopImageOptionsForScreen:mainscreen];
isCached = YES;
} }
bool MacDesktop::ChangeBackground(std::string imageURL) { bool MacDesktop::ChangeBackground(std::string imageURL) {
@ -30,6 +32,7 @@ bool MacDesktop::ChangeBackground(std::string imageURL) {
} }
bool MacDesktop::ResetBackground() { bool MacDesktop::ResetBackground() {
if (isCached == NO) return true;
BOOL success = [sharedworkspace setDesktopImageURL:originalBackground forScreen:mainscreen options:originalOptions error:nil]; BOOL success = [sharedworkspace setDesktopImageURL:originalBackground forScreen:mainscreen options:originalOptions error:nil];
return (bool)success; return (bool)success;
} }