summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorLeo Lam <leolino.lam@gmail.com>2017-10-11 11:32:09 +0200
committerGitHub <noreply@github.com>2017-10-11 11:32:09 +0200
commit53ccd41049fc33a8b196a7eb02029af178ce348a (patch)
tree6eec909065aec8ed8165db7113e9e87f46e01078 /Source/Core
parent8163fa1acc11041becfa7befbe0b447501d7923e (diff)
parent468bf75a436682b7e34ff63b292bbd8c1271a8be (diff)
Merge pull request #6099 from leoetlino/activate
Qt: Don't crash when pressing the Return key
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt2/GameList/GameList.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt2/GameList/GameList.cpp b/Source/Core/DolphinQt2/GameList/GameList.cpp
index 5e87376448..a674992d4d 100644
--- a/Source/Core/DolphinQt2/GameList/GameList.cpp
+++ b/Source/Core/DolphinQt2/GameList/GameList.cpp
@@ -472,7 +472,7 @@ void GameList::ConsiderViewChange()
}
void GameList::keyReleaseEvent(QKeyEvent* event)
{
- if (event->key() == Qt::Key_Return)
+ if (event->key() == Qt::Key_Return && GetSelectedGame() != nullptr)
emit GameSelected();
else
QStackedWidget::keyReleaseEvent(event);