Skip to content
This repository was archived by the owner on Mar 31, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@

<!-- _________________________________ Custom _______________________________ -->

<assets path='art/icons/iconOG.png' rename='icon.png' if="linux" />
<assets path='art/icons/iconOG.png' rename='icon.png' if="linux || mac" />

<icon path="art/icons/icon16.png" size='16'/>
<icon path="art/icons/icon32.png" size='32'/>
Expand Down
4 changes: 2 additions & 2 deletions source/Main.hx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import crowplexus.iris.Iris;
import psychlua.HScript.HScriptInfos;
#end

#if linux
#if (linux || mac)
import lime.graphics.Image;
#end

Expand Down Expand Up @@ -192,7 +192,7 @@ class Main extends Sprite
}
#end

#if linux
#if (linux || mac) // fix the app icon not showing up on the Linux Panel / Mac Dock
var icon = Image.fromFile("icon.png");
Lib.current.stage.window.setIcon(icon);
#end
Expand Down
8 changes: 6 additions & 2 deletions source/backend/Song.hx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,11 @@ class Song
if(folder == null) folder = jsonInput;
PlayState.SONG = getChart(jsonInput, folder);
loadedSongName = folder;
chartPath = _lastPath.replace('/', '\\');
chartPath = _lastPath;
#if windows
// prevent any saving errors by fixing the path on Windows (being the only OS to ever use backslashes instead of forward slashes for paths)
chartPath = chartPath.replace('/', '\\');
#end
StageData.loadDirectory(PlayState.SONG);
return PlayState.SONG;
}
Expand Down Expand Up @@ -179,4 +183,4 @@ class Song
}
return songJson;
}
}
}