Merge pull request #1799 from matthiaskrgr/cppcheck

address two cppcheck findings
wesnoth · Jul 25, 2017 · cca2776 · cca2776
2 parents f1fe86a + 1637493
commit cca2776
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/ai/configuration.hpp b/src/ai/configuration.hpp
@@ -105,7 +105,7 @@ class configuration {
 	 * @retval true success
 	 * @retval false failure
 	 */
-	static bool parse_side_config(side_number side, const config& cfg, config &parsed_cfg);
+	static bool parse_side_config(side_number side, const config& original_cfg, config &cfg);
 
 
 	/**

diff --git a/src/gui/dialogs/wml_message.cpp b/src/gui/dialogs/wml_message.cpp
@@ -173,7 +173,7 @@ int show_wml_message(CVideo& video,
 		dlg.reset(new wml_message_left(title, message, left->portrait, left->mirror));
 	} else if(!left && right) {
 		dlg.reset(new wml_message_right(title, message, right->portrait, right->mirror));
-	} else {
+	} else if(right && left) {
 		dlg.reset(new wml_message_double(title, message, left->portrait, left->mirror, right->portrait, right->mirror));
 	}
 	assert(dlg.get());