mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix crash on empty progress title on OS X

Browse source
This commit is contained in:
Thomas Goyne 2014-03-26 09:24:47 -07:00
parent 16804f41c9
commit 14d64daf69
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libaegisub/common/util.cpp
View file

@ -137,7 +137,7 @@ std::pair<size_t, size_t> ifind(std::string const& haystack, std::string const&
#ifndef __APPLE__ #ifndef __APPLE__
namespace osx { namespace osx {
AppNapDisabler::AppNapDisabler(std::string const& reason) { } AppNapDisabler::AppNapDisabler(std::string reason) { }
AppNapDisabler::~AppNapDisabler() { } AppNapDisabler::~AppNapDisabler() { }
} }
#endif #endif

2
libaegisub/include/libaegisub/util_osx.h
View file

@ -35,7 +35,7 @@ namespace agi {
class AppNapDisabler { class AppNapDisabler {
void *handle; void *handle;
public: public:
AppNapDisabler(std::string const& reason); AppNapDisabler(std::string reason);
~AppNapDisabler(); ~AppNapDisabler();
}; };
} }

3
libaegisub/osx/util.mm
View file

@ -29,7 +29,8 @@ static std::string EmptyIfNil(NSString *string) {
namespace agi { namespace agi {
namespace osx { namespace osx {
AppNapDisabler::AppNapDisabler(std::string const& reason) : handle(nullptr) { AppNapDisabler::AppNapDisabler(std::string reason) : handle(nullptr) {
if (reason.empty()) reason = "Loading";
auto processInfo = [NSProcessInfo processInfo]; auto processInfo = [NSProcessInfo processInfo];
if ([processInfo respondsToSelector:@selector(beginActivityWithOptions:reason:)]) if ([processInfo respondsToSelector:@selector(beginActivityWithOptions:reason:)])
handle = [[processInfo beginActivityWithOptions:NSActivityUserInitiatedAllowingIdleSystemSleep handle = [[processInfo beginActivityWithOptions:NSActivityUserInitiatedAllowingIdleSystemSleep