[Scummvm-git-logs] scummvm master -> d98d4bc25d750c1e27d21920fb5214cdbb71a961

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d98d4bc25d UPDATES: Fix crash when compiling with updates enabled but without an UpdateManager


Commit: d98d4bc25d750c1e27d21920fb5214cdbb71a961
    https://github.com/scummvm/scummvm/commit/d98d4bc25d750c1e27d21920fb5214cdbb71a961
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-09-08T21:21:53+01:00

Commit Message:
UPDATES: Fix crash when compiling with updates enabled but without an UpdateManager

This can happen when Sparkle was not found during configure which results
in USE_UPDATES being defined but USE_SPARKLE not being defined.

Changed paths:
    base/main.cpp


diff --git a/base/main.cpp b/base/main.cpp
index c52888a..4251c2c 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -484,7 +484,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	setupKeymapper(system);
 
 #ifdef USE_UPDATES
-	if (!ConfMan.hasKey("updates_check")) {
+	if (!ConfMan.hasKey("updates_check") && g_system->getUpdateManager()) {
 		GUI::UpdatesDialog dlg;
 		dlg.runModal();
 	}