Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
94364a5a
Commit
94364a5a
authored
Jan 12, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix double-close bug on OSX
parent
555b8b99
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
MainWindow.cc
src/ui/MainWindow.cc
+2
-1
MainWindow.h
src/ui/MainWindow.h
+2
-1
No files found.
src/ui/MainWindow.cc
View file @
94364a5a
...
...
@@ -395,7 +395,7 @@ void MainWindow::showStatusBarCallback(bool checked)
checked
?
statusBar
()
->
show
()
:
statusBar
()
->
hide
();
}
void
MainWindow
::
reallyClose
(
void
)
void
MainWindow
::
_
reallyClose
(
void
)
{
_forceClose
=
true
;
close
();
...
...
@@ -458,6 +458,7 @@ void MainWindow::connectCommonActions()
{
// Connect internal actions
connect
(
qgcApp
()
->
toolbox
()
->
multiVehicleManager
(),
&
MultiVehicleManager
::
vehicleAdded
,
this
,
&
MainWindow
::
_vehicleAdded
);
connect
(
this
,
&
MainWindow
::
reallyClose
,
this
,
&
MainWindow
::
_reallyClose
,
Qt
::
QueuedConnection
);
// Queued to allow closeEvent to fully unwind before _reallyClose is called
}
void
MainWindow
::
_openUrl
(
const
QString
&
url
,
const
QString
&
errorMessage
)
...
...
src/ui/MainWindow.h
View file @
94364a5a
...
...
@@ -80,7 +80,7 @@ public:
void
saveLastUsedConnection
(
const
QString
connection
);
// Called from MainWindow.qml when the user accepts the window close dialog
Q_INVOKABLE
void
reallyClose
(
void
);
void
_
reallyClose
(
void
);
/// @return Root qml object of main window QML
QObject
*
rootQmlObject
(
void
);
...
...
@@ -104,6 +104,7 @@ signals:
void
initStatusChanged
(
const
QString
&
message
,
int
alignment
,
const
QColor
&
color
);
/** Emitted when any value changes from any source */
void
valueChanged
(
const
int
uasId
,
const
QString
&
name
,
const
QString
&
unit
,
const
QVariant
&
value
,
const
quint64
msec
);
void
reallyClose
(
void
);
// Used for unit tests to know when the main window closes
void
mainWindowClosed
(
void
);
...
...
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