GUI2/Screenshot Notification: fixed wrong path being used for opening…

… screenshot (fixes #5322)

changelog.md

@@ -36,6 +36,8 @@
    * Add a overwrite_specials option for abilities like weapon could overwrite specials or other ablities like weapon
  ### Miscellaneous and Bug Fixes
    * Fixed several possible crashes in wmllint
+   * Screenshots now default to JPG instead of PNG
+   * Fixed screenshot popup sometimes using the wrong path when trying to open the screenshot after saving
 
 ## Version 1.15.7
  ### Add-ons server

src/gui/dialogs/screenshot_notification.cpp

@@ -125,6 +125,8 @@ void screenshot_notification::save_screenshot()
 	boost::filesystem::path path(screenshots_dir_path_);
 	path /= filename;
 
+	path_ = path.string();
+
 	image::save_result res = image::save_image(screenshot_, path.string());
 	if(res == image::save_result::unsupported_format) {
 		gui2::show_error_message(_("Unsupported image format.\n\n"
@@ -144,7 +146,7 @@ void screenshot_notification::save_screenshot()
 			find_widget<button>(&window, "copy", false).set_active(true);
 		}
 
-		const int filesize = filesystem::file_size(path.string());
+		const int filesize = filesystem::file_size(path_);
 		const std::string sizetext = utils::si_string(filesize, true, _("unit_byte^B"));
 		find_widget<label>(&window, "filesize", false).set_label(sizetext);
 	}

src/gui/dialogs/screenshot_notification.hpp

@@ -41,7 +41,7 @@ class screenshot_notification : public modal_dialog
 	DEFINE_SIMPLE_DISPLAY_WRAPPER(screenshot_notification)
 
 private:
-	const std::string path_;
+	std::string path_;
 	const std::string screenshots_dir_path_;
 	surface screenshot_;