summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Wagner <rusty.wagner@gmail.com>2022-01-25 00:19:21 -0500
committerRusty Wagner <rusty.wagner@gmail.com>2022-01-25 00:22:15 -0500
commita20a508bc4ffb659344bb2a0d7c5ff6021c8c980 (patch)
tree212ef8c35019b49ef947b4ba1e650857a06ba22a
parentb4e190b583a31af97935a89f589e8ae159859bae (diff)
Move file lock status widget into main window to avoid use after free when moving tabs between windows
-rw-r--r--ui/uicontext.h2
-rw-r--r--ui/viewframe.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/uicontext.h b/ui/uicontext.h
index 8dce4b38..cb9a5391 100644
--- a/ui/uicontext.h
+++ b/ui/uicontext.h
@@ -322,6 +322,8 @@ public:
*/
QString GetNameForPath(const QString& path);
+ virtual QWidget* fileContentsLockStatusWidget() = 0;
+
static void setHandler(UIContextHandler* handler);
static QSize getScaledWindowSize(int x, int y);
diff --git a/ui/viewframe.h b/ui/viewframe.h
index 29d0c823..713dee56 100644
--- a/ui/viewframe.h
+++ b/ui/viewframe.h
@@ -322,7 +322,6 @@ private:
FileContext* m_context;
bool m_fileContentsLock = true; // file contents protection from accidental modification in the UI
- ClickableStateLabel* m_fileContentsLockStatus;
BinaryViewRef m_data;
QWidget* m_view = nullptr;
QWidget* m_viewContainer;
@@ -358,7 +357,6 @@ public:
FileContext* getFileContext() const { return m_context; }
bool areFileContentsLocked(bool showToolTip = false);
void setFileContentsLocked(bool enable);
- QWidget* getFileContentsLockStatus();
DockHandler* getDockHandler();