Merge pull request #3443 from yangyingchao/master

Alexays · web-flow · commit 496dd05e1441 · 2024-07-17T22:38:22.000+02:00
fix #3442
diff --git a/src/modules/sni/watcher.cpp b/src/modules/sni/watcher.cpp
@@ -67,10 +67,9 @@ gboolean Watcher::handleRegisterHost(Watcher* obj, GDBusMethodInvocation* invoca
   }
   auto watch = gfWatchFind(obj->hosts_, bus_name, object_path);
   if (watch != nullptr) {
-    g_dbus_method_invocation_return_error(
-        invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
-        "Status Notifier Host with bus name '%s' and object path '%s' is already registered",
-        bus_name, object_path);
+    g_warning("Status Notifier Host with bus name '%s' and object path '%s' is already registered",
+              bus_name, object_path);
+    sn_watcher_complete_register_item(obj->watcher_, invocation);
     return TRUE;
   }
   watch = gfWatchNew(GF_WATCH_TYPE_HOST, service, bus_name, object_path, obj);

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,9 @@ gboolean Watcher::handleRegisterHost(Watcher* obj, GDBusMethodInvocation* invoca`
`67`	`67`	`}`
`68`	`68`	`auto watch = gfWatchFind(obj->hosts_, bus_name, object_path);`
`69`	`69`	`if (watch != nullptr) {`
`70`		`- g_dbus_method_invocation_return_error(`
`71`		`- invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,`
`72`		`- "Status Notifier Host with bus name '%s' and object path '%s' is already registered",`
`73`		`- bus_name, object_path);`
	`70`	`+ g_warning("Status Notifier Host with bus name '%s' and object path '%s' is already registered",`
	`71`	`+ bus_name, object_path);`
	`72`	`+ sn_watcher_complete_register_item(obj->watcher_, invocation);`
`74`	`73`	`return TRUE;`
`75`	`74`	`}`
`76`	`75`	`watch = gfWatchNew(GF_WATCH_TYPE_HOST, service, bus_name, object_path, obj);`