diff options
| author |  Lioncash | 2019-05-25 04:06:48 -0400 |
|---|---|---|
| committer | Lioncash | 2019-05-25 04:08:18 -0400 |
| commit | d61199721d4815841edd564ee2153cff11e66996 (patch) | |
| tree | 2a4d68e1551f99e99ee865d6645dddc4723f6716 /src | |
| parent | configure_hotkeys: Move conflict detection logic to IsUsedKey() (diff) | |
| download | yuzu-d61199721d4815841edd564ee2153cff11e66996.tar.gz yuzu-d61199721d4815841edd564ee2153cff11e66996.tar.xz yuzu-d61199721d4815841edd564ee2153cff11e66996.zip | |
configure_hotkeys: Change critical error dialog into a warning dialog
critical() is intended for critical/fatal errors that threaten the
overall stability of an application. A user entering a conflicting key
sequence is neither of those.
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_hotkeys.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_hotkeys.cpp b/src/yuzu/configuration/configure_hotkeys.cpp index 02f2daabc..583fd6a0e 100644 --- a/src/yuzu/configuration/configure_hotkeys.cpp +++ b/src/yuzu/configuration/configure_hotkeys.cpp | |||
| @@ -67,8 +67,8 @@ void ConfigureHotkeys::Configure(QModelIndex index) { | |||
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | if (IsUsedKey(key_sequence) && key_sequence != QKeySequence(previous_key.toString())) { | 69 | if (IsUsedKey(key_sequence) && key_sequence != QKeySequence(previous_key.toString())) { |
| 70 | QMessageBox::critical(this, tr("Error in inputted key"), | 70 | QMessageBox::warning(this, tr("Error in inputted key"), |
| 71 | tr("You're using a key that's already bound.")); | 71 | tr("You're using a key that's already bound.")); |
| 72 | } else { | 72 | } else { |
| 73 | model->setData(index, key_sequence.toString(QKeySequence::NativeText)); | 73 | model->setData(index, key_sequence.toString(QKeySequence::NativeText)); |
| 74 | } | 74 | } |