From a1f1656c362118b54a3ab4d40af42fa30a1d10ca Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sun, 19 May 2019 08:53:59 -0400
Subject: re-enabled unhide menu item in the conflict tree since hidden items
 can actually appear

---
 src/modinfodialog.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/modinfodialog.cpp')

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()));
-- 
cgit v1.3.1