Fixed isLoaded issues for Gtk and AppIndicator
This commit is contained in:
parent
c12eacf3fc
commit
c7e90049e6
@ -231,8 +231,8 @@ class AppIndicator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (shouldLoadAppIndicator) {
|
if (shouldLoadAppIndicator && _isLoaded) {
|
||||||
isLoaded = _isLoaded;
|
isLoaded = true;
|
||||||
isVersion3 = _isVersion3;
|
isVersion3 = _isVersion3;
|
||||||
} else {
|
} else {
|
||||||
isLoaded = false;
|
isLoaded = false;
|
||||||
|
@ -167,9 +167,9 @@ class Gtk {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
isLoaded = _isLoaded;
|
if (shouldLoadGtk && _isLoaded) {
|
||||||
|
isLoaded = true;
|
||||||
|
|
||||||
if (_isLoaded) {
|
|
||||||
// depending on how the system is initialized, SWT may, or may not, have the gtk_main loop running. It will EVENTUALLY run, so we
|
// depending on how the system is initialized, SWT may, or may not, have the gtk_main loop running. It will EVENTUALLY run, so we
|
||||||
// do not want to run our own GTK event loop.
|
// do not want to run our own GTK event loop.
|
||||||
_alreadyRunningGTK |= SystemTray.isSwtLoaded;
|
_alreadyRunningGTK |= SystemTray.isSwtLoaded;
|
||||||
@ -182,6 +182,8 @@ class Gtk {
|
|||||||
isGtk2 = _isGtk2;
|
isGtk2 = _isGtk2;
|
||||||
isGtk3 = !_isGtk2;
|
isGtk3 = !_isGtk2;
|
||||||
} else {
|
} else {
|
||||||
|
isLoaded = false;
|
||||||
|
|
||||||
alreadyRunningGTK = false;
|
alreadyRunningGTK = false;
|
||||||
isGtk2 = false;
|
isGtk2 = false;
|
||||||
isGtk3 = false;
|
isGtk3 = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user