blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2217 from LukashonakV/g_bus_unwatch_name 

Tray module causes: Invalid id passed to g_bus_unwatch_name()
This commit is contained in:
Alex 2023-06-06 22:37:46 +02:00 committed by GitHub
parent d638610db1 a9779c2aa2
commit 070110af0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/sni/host.cpp
View File

@ -22,10 +22,6 @@ Host::~Host() {
Gio::DBus::unwatch_name(bus_name_id_); Gio::DBus::unwatch_name(bus_name_id_);
bus_name_id_ = 0; bus_name_id_ = 0;
} }
if (watcher_id_ > 0) {
Gio::DBus::unwatch_name(watcher_id_);
watcher_id_ = 0;
}
g_cancellable_cancel(cancellable_); g_cancellable_cancel(cancellable_);
g_clear_object(&cancellable_); g_clear_object(&cancellable_);
g_clear_object(&watcher_); g_clear_object(&watcher_);

5
src/modules/sni/watcher.cpp
View File

@ -14,11 +14,6 @@ Watcher::Watcher()
watcher_(sn_watcher_skeleton_new()) {} watcher_(sn_watcher_skeleton_new()) {}
Watcher::~Watcher() { Watcher::~Watcher() {
if (hosts_ != nullptr) {
g_slist_free_full(hosts_, gfWatchFree);
hosts_ = nullptr;
}
if (items_ != nullptr) { if (items_ != nullptr) {
g_slist_free_full(items_, gfWatchFree); g_slist_free_full(items_, gfWatchFree);
items_ = nullptr; items_ = nullptr;