summaryrefslogtreecommitdiff
path: root/src/modinfodialog.cpp
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2019-05-19 08:53:59 -0400
committerisanae <14251494+isanae@users.noreply.github.com>2019-05-19 08:53:59 -0400
commita1f1656c362118b54a3ab4d40af42fa30a1d10ca (patch)
treec5c3f5704d71ef5359af68ea67144faa952921be /src/modinfodialog.cpp
parent2c30d2d0e92e7e7ad5a1209a0efd81d39b353a26 (diff)
re-enabled unhide menu item in the conflict tree since hidden items can actually appear
Diffstat (limited to 'src/modinfodialog.cpp')
-rw-r--r--src/modinfodialog.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index eb91f73d..f7910b3c 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -1840,11 +1840,11 @@ void ModInfoDialog::on_overwriteTree_customContextMenuRequested(const QPoint &po
menu.addAction(tr("Hide"), this, SLOT(hideConflictFiles()));
}
- // disabling this for now, because hidden files are never shows in this list
- // at all; if this ever changes, this should be added back
- //if (enableUnhide) {
- // menu.addAction(tr("Un-Hide"), this, SLOT(unhideConflictFiles()));
- //}
+ // note that it is possible for hidden files to appear if they override other
+ // hidden files from another mod
+ if (enableUnhide) {
+ menu.addAction(tr("Un-Hide"), this, SLOT(unhideConflictFiles()));
+ }
if (enableOpen) {
menu.addAction(tr("Open/Execute"), this, SLOT(openOverwriteDataFile()));