Skip to content

Commit 2c1e541

Browse files
authored
Merge pull request AppleWin#220 from audetto/fixes
Fixes
2 parents 6893f25 + fdba92d commit 2c1e541

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

source/frontends/common2/gnuframe.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,17 @@ namespace
6666
}
6767
}
6868

69-
throw std::runtime_error("Cannot found the resource path: " + target);
69+
// this is now used only for g_sProgramDir
70+
// which only matters for Debug Symbols and Printer Filename
71+
// let's be tolerant and use cwd
72+
73+
char szFilename[MAX_PATH];
74+
if (GetCurrentDirectory(sizeof(szFilename), szFilename))
75+
{
76+
return std::string(szFilename) + PATH_SEPARATOR;
77+
}
78+
79+
throw std::runtime_error("Cannot find the resource path for: " + target);
7080
}
7181

7282
}

source/linux/context.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "CardManager.h"
1313
#include "Log.h"
1414
#include "Utilities.h"
15-
#include "SoundCore.h"
15+
#include "Keyboard.h"
1616
#include "CPU.h"
1717
#include "Riff.h"
1818
#include "SaveState.h"
@@ -117,6 +117,7 @@ void InitialiseEmulator(const AppMode_e mode)
117117
Snapshot_Startup();
118118

119119
DebugInitialize();
120+
KeybReset();
120121
}
121122

122123
void DestroyEmulator()

source/linux/libwindows/fileapi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,5 @@ HANDLE CreateFile(LPCTSTR lpFileName,
7171

7272
DWORD GetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh);
7373

74+
// non "/" terminated
7475
DWORD GetCurrentDirectory(DWORD, char *);

0 commit comments

Comments
 (0)