Skip to content

Commit 62f5b10

Browse files
author
Maxie D. Schmidt
committed
Fixed segfaults when the main window is minimized
1 parent f652e46 commit 62f5b10

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

scripts/BuildTargetInfo.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#define FLTK_USE_CAIRO 1
5252
#define FLTK_HAVE_CAIRO 1
5353

54-
#define RNASTRUCTVIZ_VSTRING ("RNAStructViz v1.4.9-testing -- RNA Secondary Structure Comparison Multi-Tool")
54+
#define RNASTRUCTVIZ_VSTRING ("RNAStructViz v1.5.0-testing -- RNA Secondary Structure Comparison Multi-Tool")
5555

5656
#define GIT_COMMIT_HASH ("##__GIT_COMMITREV_HASHNUM__##")
5757
#define GIT_COMMIT_HASH_SHORT ("##__GIT_COMMITREV_HASHNUM_SHORT__##")

src/MainWindow.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ MainWindow::MainWindow(int argc, char **argv)
3232
{
3333
m_mainWindow = new Fl_Double_Window(650, 450, RNASTRUCTVIZ_VSTRING);
3434
m_mainWindow->size_range(650, 450, 650, 450);
35-
//m_mainWindow->callback(CloseCallback);
35+
m_mainWindow->callback(CloseCallback);
3636
m_mainWindow->color(GUI_WINDOW_BGCOLOR);
3737
m_mainWindow->begin();
3838

@@ -158,7 +158,6 @@ MainWindow::~MainWindow()
158158
if (m_fileChooser) {
159159
delete m_fileChooser;
160160
}
161-
Delete(m_mainWindow);
162161
Delete(m_packedInfo);
163162
Delete(m_structureInfo);
164163
Delete(columnLabel);
@@ -171,6 +170,7 @@ MainWindow::~MainWindow()
171170
delete folderDataBtns[w];
172171
folderDataBtns[w] = NULL;
173172
}
173+
Delete(m_mainWindow);
174174
}
175175

176176
bool MainWindow::Initialize(int argc, char **argv)
@@ -191,8 +191,7 @@ void MainWindow::Shutdown()
191191
}
192192

193193
bool MainWindow::IsRunning() {
194-
return (ms_instance != NULL) && (ms_instance->m_mainWindow != NULL) &&
195-
ms_instance->m_mainWindow->visible();
194+
return (ms_instance != NULL) && (ms_instance->m_mainWindow != NULL);
196195
}
197196

198197
void MainWindow::AddFolder(const char* foldername, const int index,

0 commit comments

Comments
 (0)