cromer
/
pamac-classic
2
0
Fork 2
Code Issues 2 Pull Requests Releases 13 Wiki Activity

fix tray

This commit is contained in:
Chris Cromer 2019-07-19 08:42:19 -04:00
parent cd1f361c51
commit 285431e0ab
Signed by: cromer
GPG Key ID: 39CC813FF3C8708A
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pamac-tray/tray.vala
View File

@ -303,7 +303,10 @@ namespace Pamac {
start_daemon (); start_daemon ();
try { try {
lockfile = GLib.File.new_for_path (daemon.get_lockfile ()); string path = daemon.get_lockfile ();
if (path != null) {
lockfile = GLib.File.new_for_path (path);
}
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
try_standard_lock (); try_standard_lock ();
@ -323,14 +326,8 @@ namespace Pamac {
this.hold (); this.hold ();
} }
private try_standard_lock () { private void try_standard_lock () {
try { lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
} catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message);
} catch (DBusError e) {
stderr.printf ("DBusError: %s\n", e.message);
}
} }
public override void activate () { public override void activate () {