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
662c5b61
Commit
662c5b61
authored
Nov 18, 2014
by
Don Gagne
Browse files
Remove goto style error handling overkill
parent
34e85677
Changes
1
Show whitespace changes
Inline
Side-by-side
src/ui/MainWindow.cc
View file @
662c5b61
...
...
@@ -1085,10 +1085,9 @@ bool MainWindow::loadStyle(QGC_MAINWINDOW_STYLE style, QString cssFile)
}
else
{
qDebug
()
<<
"Unable to load master style sheet"
;
success
=
false
;
goto
Error
;
}
if
(
cssFile
!=
masterCssFile
)
{
if
(
success
&&
cssFile
!=
masterCssFile
)
{
// Load the slave user specified stylesheet.
QFile
styleSheet
(
cssFile
);
if
(
styleSheet
.
open
(
QIODevice
::
ReadOnly
|
QIODevice
::
Text
))
...
...
@@ -1114,11 +1113,9 @@ bool MainWindow::loadStyle(QGC_MAINWINDOW_STYLE style, QString cssFile)
}
else
{
qDebug
()
<<
"Unable to load slave style sheet:"
<<
cssFile
;
success
=
false
;
goto
Error
;
}
}
Error:
// Finally restore the cursor before returning.
qApp
->
restoreOverrideCursor
();
...
...
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