Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3aa2c507
Unverified
Commit
3aa2c507
authored
Apr 14, 2018
by
Don Gagne
Committed by
GitHub
Apr 14, 2018
Browse files
Merge pull request #6351 from DonLakeFlyer/WindowClose
Back out bad pull: #6155
parents
23a1c919
0638c885
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ui/MainWindowHybrid.qml
View file @
3aa2c507
...
...
@@ -22,12 +22,7 @@ Item {
}
function
attemptWindowClose
()
{
try
{
mainWindowInner
.
item
.
attemptWindowClose
()
}
finally
{
controller
.
reallyClose
()
}
mainWindowInner
.
item
.
attemptWindowClose
()
}
function
showMessage
(
message
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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