summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-05-25 10:19:51 +0200
committerLioncash <mathew1800@gmail.com>2019-05-25 10:25:11 +0200
commit6640f631e2a97f376c42ef2e1e5a316ab61d9dc5 (patch)
tree132b28037ac99bc2c0ae30267a428894fab5ad28
parentconfigure_hotkeys: Change critical error dialog into a warning dialog (diff)
downloadyuzu-6640f631e2a97f376c42ef2e1e5a316ab61d9dc5.tar
yuzu-6640f631e2a97f376c42ef2e1e5a316ab61d9dc5.tar.gz
yuzu-6640f631e2a97f376c42ef2e1e5a316ab61d9dc5.tar.bz2
yuzu-6640f631e2a97f376c42ef2e1e5a316ab61d9dc5.tar.lz
yuzu-6640f631e2a97f376c42ef2e1e5a316ab61d9dc5.tar.xz
yuzu-6640f631e2a97f376c42ef2e1e5a316ab61d9dc5.tar.zst
yuzu-6640f631e2a97f376c42ef2e1e5a316ab61d9dc5.zip
-rw-r--r--src/yuzu/configuration/configure_hotkeys.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_hotkeys.cpp b/src/yuzu/configuration/configure_hotkeys.cpp
index 583fd6a0e..c486ac2ed 100644
--- a/src/yuzu/configuration/configure_hotkeys.cpp
+++ b/src/yuzu/configuration/configure_hotkeys.cpp
@@ -67,8 +67,8 @@ void ConfigureHotkeys::Configure(QModelIndex index) {
}
if (IsUsedKey(key_sequence) && key_sequence != QKeySequence(previous_key.toString())) {
- QMessageBox::warning(this, tr("Error in inputted key"),
- tr("You're using a key that's already bound."));
+ QMessageBox::warning(this, tr("Conflicting Key Sequence"),
+ tr("The entered key sequence is already assigned to another hotkey."));
} else {
model->setData(index, key_sequence.toString(QKeySequence::NativeText));
}