dorkbox/SystemTray
2
1
Fork 1
Code Issues Pull Requests Releases 5 Wiki Activity

Fixed isLoaded issues for Gtk and AppIndicator

Browse Source
This commit is contained in:
nathan 2016-12-28 23:54:06 +01:00
parent c12eacf3fc
commit c7e90049e6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dorkbox/systemTray/jna/linux/AppIndicator.java
View File

@ -231,8 +231,8 @@ class AppIndicator {
}
}
if (shouldLoadAppIndicator) {
isLoaded = _isLoaded;
if (shouldLoadAppIndicator && _isLoaded) {
isLoaded = true;
isVersion3 = _isVersion3;
} else {
isLoaded = false;

6
src/dorkbox/systemTray/jna/linux/Gtk.java
View File

@ -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
// do not want to run our own GTK event loop.
_alreadyRunningGTK |= SystemTray.isSwtLoaded;
@ -182,6 +182,8 @@ class Gtk {
isGtk2 = _isGtk2;
isGtk3 = !_isGtk2;
} else {
isLoaded = false;
alreadyRunningGTK = false;
isGtk2 = false;
isGtk3 = false;