Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
f0d7fadd
Commit
f0d7fadd
authored
Nov 27, 2020
by
Christoffer Ackelman
Committed by
Esteban Blanc
Dec 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Fixed segfault when closing GE.
parent
2ce662fe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
15 deletions
+10
-15
xtt/lib/cow/qt/cow_wow_qt.cqt
xtt/lib/cow/qt/cow_wow_qt.cqt
+0
-6
xtt/lib/cow/qt/cow_wow_qt.h
xtt/lib/cow/qt/cow_wow_qt.h
+0
-1
xtt/lib/ge/qt/ge_qt.cqt
xtt/lib/ge/qt/ge_qt.cqt
+6
-6
xtt/lib/ge/qt/ge_subgraphs_qt.cqt
xtt/lib/ge/qt/ge_subgraphs_qt.cqt
+4
-2
No files found.
xtt/lib/cow/qt/cow_wow_qt.cqt
View file @
f0d7fadd
...
...
@@ -309,12 +309,6 @@ void CoWowQt::PopList(void* data)
pop(ctx);
}
void CoWowQt::DeleteList(void* data)
{
CoWowListWidgetQt* ctx = (CoWowListWidgetQt*)data;
ctx->close();
}
void CoWowWarrantQt::reject()
{
QDialog::reject();
...
...
xtt/lib/cow/qt/cow_wow_qt.h
View file @
f0d7fadd
...
...
@@ -196,7 +196,6 @@ public:
void
(
action_cb
)(
void
*
,
char
*
,
int
),
void
(
cancel_cb
)(
void
*
),
void
*
ctx
,
int
show_apply_button
=
0
);
void
PopList
(
void
*
ctx
);
void
DeleteList
(
void
*
ctx
);
void
CreateFileSelDia
(
const
char
*
title
,
void
*
parent_ctx
,
void
(
*
file_selected_cb
)(
void
*
,
char
*
,
wow_eFileSelType
),
wow_eFileSelType
file_type
,
wow_eFileSelAction
action
);
...
...
xtt/lib/ge/qt/ge_qt.cqt
View file @
f0d7fadd
...
...
@@ -63,6 +63,7 @@
#include "wb_wnav_selformat.h"
#include <QApplication>
#include <QCloseEvent>
#include <QFontDatabase>
#include <QHBoxLayout>
#include <QInputDialog>
...
...
@@ -1237,7 +1238,7 @@ void GeQt::update()
void GeQtWidget::closeEvent(QCloseEvent* event)
{
ge->Ge::activate_exit();
QWidget::closeEvent(event
);
event->ignore(
);
}
void GeQtWidget::focusInEvent(QFocusEvent* event)
...
...
@@ -1266,11 +1267,11 @@ GeQt::~GeQt()
}
if (open_dialog) {
wow->DeleteList(open_dialog
);
((CoWowListWidgetQt*)open_dialog)->close(
);
}
if (subgraphs
_widget
) {
subgraphs_widget->close()
;
if (subgraphs) {
delete subgraphs
;
}
delete subpalette;
delete recall_entry;
...
...
@@ -1288,7 +1289,7 @@ GeQt::~GeQt()
delete objectnav;
}
toplevel->close()
;
delete toplevel
;
if (exit_when_close) {
exit(0);
...
...
@@ -1325,7 +1326,6 @@ GeQt::GeQt(void* x_parent_ctx, ldh_tSesContext x_ldhses, int x_exit_when_close,
toplevel->setMinimumSize(window_width, window_height);
toplevel->setWindowTitle(fl(title));
toplevel->setAttribute(Qt::WA_DeleteOnClose);
CoWowQt::SetWindowIcon(toplevel);
...
...
xtt/lib/ge/qt/ge_subgraphs_qt.cqt
View file @
f0d7fadd
...
...
@@ -45,6 +45,7 @@
#include "ge_attr_qt.h"
#include "ge_subgraphs_qt.h"
#include <QCloseEvent>
#include <QMenuBar>
#include <QTimer>
#include <QVBoxLayout>
...
...
@@ -57,7 +58,7 @@ void SubGraphsQtWidget::closeEvent(QCloseEvent* event)
trace_timerid->stop();
delete subgraphs;
}
QWidget::closeEvent(event
);
event->ignore(
);
}
void SubGraphsQtWidget::focusInEvent(QFocusEvent* event)
...
...
@@ -119,7 +120,6 @@ SubGraphsQt::SubGraphsQt(void* xn_parent_ctx, const char* xn_name,
toplevel = new SubGraphsQtWidget(this);
toplevel->setMinimumSize(300, 500);
toplevel->setWindowTitle(fl(name));
toplevel->setAttribute(Qt::WA_DeleteOnClose);
// Menu
QMenuBar* menu_bar = new QMenuBar(toplevel);
...
...
@@ -171,6 +171,8 @@ SubGraphsQt::~SubGraphsQt()
}
delete brow;
delete toplevel;
}
void SubGraphsQt::trace_start()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment