Fix #3599: crash with custom themes on desktop PCs

wesnoth · Oct 6, 2018 · 4a23c8b · 4a23c8b
1 parent 5b03a80
commit 4a23c8b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,7 @@
  ### Lua API
    * Fix wesnoth.set_dialog_value not triggering re-layout. (issue #3572)
  ### Miscellaneous and bug fixes
+   * Fix crash with custom themes on desktop PCs. (issue #3599)
    * Add --campaign-skip-story command line switch for skipping directly to turn 1. (issue #3472)
    * Fix documentation of --render-image command line switch. (issue #3568)
  ### User interface

diff --git a/src/theme.cpp b/src/theme.cpp
@@ -462,12 +462,15 @@ theme::status_item::status_item(const config& cfg)
 
 SDL_Rect& theme::countdown::location(const SDL_Rect& screen) const
 {
-	if(desktop::battery_info::does_device_have_battery()) {
-		return status_item::location(screen);
-	} else {
-		return display::get_singleton()->get_theme().
-			get_status_item("battery")->location(screen);
+	if(!desktop::battery_info::does_device_have_battery()) {
+		const object* battery = display::get_singleton()->get_theme().
+			get_status_item("battery");
+		if(battery != nullptr) {
+			return battery->location(screen);
+		}
 	}
+
+	return status_item::location(screen);
 }
 
 theme::panel::panel(const config& cfg)