Skip to content

Commit

Permalink
Fix save state export dialog not opening
Browse files Browse the repository at this point in the history
  • Loading branch information
black-sliver committed Feb 28, 2024
1 parent 8f82682 commit e34da80
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* Fix scrolling behavior in map tooltip when last element is hidden
* Fix unnamed map tooltip section not properly updating
* Fix handling of leading comma in json and Item.IconMods
* Fix save state export dialog not opening when pack name has special characters in it

## v0.25.7

Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ HDR = $(wildcard $(SRC_DIR)/*.h) \
$(wildcard $(SRC_DIR)/ap/*.h) \
$(wildcard $(SRC_DIR)/luaconnector/*.h) \
$(wildcard $(SRC_DIR)/http/*.h) \
$(wildcard $(SRC_DIR)/packmanager/*.h)
$(wildcard $(SRC_DIR)/packmanager/*.h) \
$(wildcard $(LIB_DIR)/tinyfiledialogs/*)
INCLUDE_DIRS = -Ilib -Ilib/lua -Ilib/asio/include -DASIO_STANDALONE -Ilib/miniz -Ilib/json/include -Ilib/valijson/include -Ilib/tinyfiledialogs -Ilib/wswrap/include #-Ilib/gifdec
WIN32_INCLUDE_DIRS = -Iwin32-lib/i686/include
WIN32_LIB_DIRS = -L./win32-lib/i686/bin -L./win32-lib/i686/lib
Expand Down
5 changes: 3 additions & 2 deletions src/poptracker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,9 @@ bool PopTracker::start()
if (!_pack) return;
std::string lastName;
if (_exportFile.empty() || _exportUID != _pack->getUID()) {
lastName = _pack->getGameName() + ".json";
if (!_exportDir.empty()) lastName = os_pathcat(_exportDir, lastName);
lastName = sanitize_filename(_pack->getGameName()) + ".json";
if (!_exportDir.empty())
lastName = os_pathcat(_exportDir, lastName);
} else {
lastName = _exportFile;
}
Expand Down

0 comments on commit e34da80

Please sign in to comment.