Skip to content

Commit

Permalink
Merge pull request #13 from Glumboi/Experimental
Browse files Browse the repository at this point in the history
GlumSak 2.2.1.1 Merge
  • Loading branch information
Glumboi authored Mar 13, 2023
2 parents 52df9a6 + a4d6d79 commit f2e4386
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion EmuSak-Revive.GUI-WPF/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void Translate()
StartInfo =
{
FileName = "EmuSak-Revive.CrashReporter.exe",
Arguments = $"\"Short version: {TranslateShort()}\n\nDetailed Error: {TranslateLong()}\""
Arguments = $"\"\nGlumSak Version {Assembly.GetExecutingAssembly().GetName().Version} Crashed:\n\nShort version: {TranslateShort()}\n\nDetailed Error: {TranslateLong()}\""
}
};
process.Start();
Expand Down
4 changes: 2 additions & 2 deletions EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.2.1.0")]
[assembly: AssemblyFileVersion("2.2.1.0")]
[assembly: AssemblyVersion("2.2.1.1")]
[assembly: AssemblyFileVersion("2.2.1.1")]
4 changes: 2 additions & 2 deletions EmuSak-Revive/EmuSak-Revive.Emulators/Yuzu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ public static void GetCustomNand()
{
string configIniPath = string.IsNullOrWhiteSpace(PortableYuzuPath) ? configIni : portableConfigIni;

if (!File.Exists(configIniPath)) return;

IniParser iniParser = new IniParser(configIniPath);

customNandLoc = iniParser.GetSetting("Data%20Storage", "nand_directory");

if (customNandLoc == null) return;

if (customNandLoc.Contains(@"\\"))
{
var forwardLoc = customNandLoc.Replace(@"\\", @"/");
Expand Down

0 comments on commit f2e4386

Please sign in to comment.