Do not unconditionally show splash screen
This commit is contained in:
parent
8607a6ef8d
commit
e4bdb99f60
@ -2960,7 +2960,9 @@ what you would like to do.\n"), PROGRAM_NAME));
|
|||||||
image->show();
|
image->show();
|
||||||
hbox->show();
|
hbox->show();
|
||||||
|
|
||||||
Splash::instance()->hide ();
|
if (Splash::exists ()) {
|
||||||
|
Splash::instance()->hide ();
|
||||||
|
}
|
||||||
|
|
||||||
switch (dialog.run ()) {
|
switch (dialog.run ()) {
|
||||||
case RESPONSE_ACCEPT:
|
case RESPONSE_ACCEPT:
|
||||||
|
@ -51,7 +51,7 @@ Message::run ()
|
|||||||
{
|
{
|
||||||
|
|
||||||
bool splash_pushed = false;
|
bool splash_pushed = false;
|
||||||
Splash* spl = Splash::instance();
|
Splash* spl = Splash::exists () ? Splash::instance() : NULL;
|
||||||
if (spl && spl->is_visible()) {
|
if (spl && spl->is_visible()) {
|
||||||
spl->pop_back_for (_message_dialog);
|
spl->pop_back_for (_message_dialog);
|
||||||
splash_pushed = true;
|
splash_pushed = true;
|
||||||
@ -61,7 +61,7 @@ Message::run ()
|
|||||||
_message_dialog.hide ();
|
_message_dialog.hide ();
|
||||||
|
|
||||||
if (splash_pushed) {
|
if (splash_pushed) {
|
||||||
spl = Splash::instance();
|
spl = Splash::exists () ? Splash::instance() : NULL;
|
||||||
if (spl) {
|
if (spl) {
|
||||||
spl->pop_front_for (_message_dialog);
|
spl->pop_front_for (_message_dialog);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user