diff options
| author | Bastien Nocera <hadess@hadess.net> | 2018-04-16 08:54:08 +0000 |
|---|---|---|
| committer | Marco Trevisan <mail@3v1n0.net> | 2018-08-31 14:58:05 +0000 |
| commit | 15f01174ff9d4b539fe125e219f269943f02993a (patch) | |
| tree | e006adf5e1f68af6bb358d665ef74d3fa93fc2ec | |
| parent | f45af3315d4f11e16fc998322e4b407437259ce1 (diff) | |
| download | mutter-15f01174ff9d4b539fe125e219f269943f02993a.tar.gz | |
monitor-manager: Don't throw an error if UPower isn't running
Don't try to connect to a UpClient signal if creating the client failed,
because UPower isn't running for example.
(cherry picked from commit 644a618fb15d90056107bc4e1fbd7397f17219a8)
| -rw-r--r-- | src/backends/meta-monitor-manager.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c index c4c1db5ed..edfa1f64d 100644 --- a/src/backends/meta-monitor-manager.c +++ b/src/backends/meta-monitor-manager.c @@ -733,8 +733,11 @@ meta_monitor_manager_constructed (GObject *object) if (manager_class->is_lid_closed == meta_monitor_manager_real_is_lid_closed) { manager->up_client = up_client_new (); - g_signal_connect_object (manager->up_client, "notify::lid-is-closed", - G_CALLBACK (lid_is_closed_changed), manager, 0); + if (manager->up_client) + { + g_signal_connect_object (manager->up_client, "notify::lid-is-closed", + G_CALLBACK (lid_is_closed_changed), manager, 0); + } } g_signal_connect_object (manager, "notify::power-save-mode", |