summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-04-08 04:09:38 +0200
committerLennart Poettering <lennart@poettering.net>2009-04-08 04:09:38 +0200
commit8a490558da1632c36a63479e5811e0de424463a8 (patch)
treede20e5ca9ce98882dbc3c681d72f34e3a9ee258e /src
parentfeff1f6f0592c1f085241bb9d3794b723d524f2e (diff)
don't show wait cursor forever if stream_restore extension is not available
Diffstat (limited to 'src')
-rw-r--r--src/pavucontrol.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
index 92afe17..423c44b 100644
--- a/src/pavucontrol.cc
+++ b/src/pavucontrol.cc
@@ -53,7 +53,6 @@ void show_error(const char *txt) {
Gtk::Main::quit();
}
-
static void dec_outstanding(MainWindow *w) {
if (n_outstanding <= 0)
return;
@@ -212,7 +211,8 @@ void ext_stream_restore_read_cb(
MainWindow *w = static_cast<MainWindow*>(userdata);
if (eol < 0) {
- g_debug(_("Failed to initialized stream_restore extension: %s"), pa_strerror(pa_context_errno(context)));
+ dec_outstanding(w);
+ g_debug(_("Failed to initialize stream_restore extension: %s"), pa_strerror(pa_context_errno(context)));
w->deleteEventRoleWidget();
return;
}
@@ -427,7 +427,8 @@ void context_state_callback(pa_context *c, void *userdata) {
pa_operation_unref(o);
} else
- g_debug(_("Failed to initialized stream_restore extension: %s"), pa_strerror(pa_context_errno(context)));
+ g_debug(_("Failed to initialize stream_restore extension: %s"), pa_strerror(pa_context_errno(context)));
+
break;
}