aboutsummaryrefslogtreecommitdiff
path: root/src/frontend/qt_sdl/main.cpp
diff options
context:
space:
mode:
authorNadia Holmquist Pedersen <nadia@nhp.sh>2020-07-26 21:41:09 +0200
committerNadia Holmquist Pedersen <nadia@nhp.sh>2020-07-26 21:41:09 +0200
commitb4ad35948d864cbbb8e1759fbbc913870293160e (patch)
treed5c0ff7f5e4e4388f99650866af063a594aebdab /src/frontend/qt_sdl/main.cpp
parent0e7df468c761579e9378183ad7f1e8ba3b405ac0 (diff)
parentd9e1bf737c23f688871b2f422bc710777dffbd94 (diff)
Merge remote-tracking branch 'upstream/slirp' into slirp-merge
Diffstat (limited to 'src/frontend/qt_sdl/main.cpp')
-rw-r--r--src/frontend/qt_sdl/main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index de6887c..47b3490 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -1285,6 +1285,8 @@ void MainWindow::keyPressEvent(QKeyEvent* event)
{
if (event->isAutoRepeat()) return;
+ if (event->key() == Qt::Key_F11) NDS::debug(0);
+
Input::KeyPress(event);
}
@@ -2083,12 +2085,12 @@ int CALLBACK WinMain(HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int cmdsho
if (argv_w) LocalFree(argv_w);
- if (AttachConsole(ATTACH_PARENT_PROCESS))
+ /*if (AttachConsole(ATTACH_PARENT_PROCESS))
{
freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
printf("\n");
- }
+ }*/
int ret = main(argc, argv);