From 4214b0e901176e018d731384a45198438c10252a Mon Sep 17 00:00:00 2001 From: Vinyl Darkscratch Date: Thu, 1 Mar 2018 16:18:40 -0800 Subject: [PATCH] Prevent crash on resetting background when original isn't cached --- src/mac-desktop.mm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mac-desktop.mm b/src/mac-desktop.mm index db1776b..bafe4e9 100644 --- a/src/mac-desktop.mm +++ b/src/mac-desktop.mm @@ -10,6 +10,7 @@ #import #import +NSBool isCached = NO; NSURL *originalBackground; NSDictionary *originalOptions; @@ -19,6 +20,7 @@ NSWorkspace *sharedworkspace = [NSWorkspace sharedWorkspace]; void MacDesktop::CacheCurrentBackground() { originalBackground = [sharedworkspace desktopImageURLForScreen:mainscreen]; originalOptions = [sharedworkspace desktopImageOptionsForScreen:mainscreen]; + isCached = YES; } bool MacDesktop::ChangeBackground(std::string imageURL) { @@ -30,6 +32,7 @@ bool MacDesktop::ChangeBackground(std::string imageURL) { } bool MacDesktop::ResetBackground() { + if (isCached == NO) return true; BOOL success = [sharedworkspace setDesktopImageURL:originalBackground forScreen:mainscreen options:originalOptions error:nil]; return (bool)success; }