diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-04-23 17:32:19 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-04-24 12:41:41 +0200 |
| commit | d41a57e35224dba943912ee2bd5fef5553de0f85 (patch) | |
| tree | 3be4ba424353965df99abb3a7cd7fd8c0fa3dfa4 | |
| parent | 50add15ef69cde34346e11b5c91e1257cecb2696 (diff) | |
Lower a few warnings when migration fails
| -rw-r--r-- | gtk/channel-main.c | 2 | ||||
| -rw-r--r-- | gtk/spice-session.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gtk/channel-main.c b/gtk/channel-main.c index 9de51d7..6d5281e 100644 --- a/gtk/channel-main.c +++ b/gtk/channel-main.c @@ -1517,7 +1517,7 @@ static void migrate_channel_event_cb(SpiceChannel *channel, SpiceChannelEvent ev coroutine_yieldto(mig->from, NULL); break; default: - g_warning("error or unhandled channel event during migration: %d", event); + SPICE_DEBUG("error or unhandled channel event during migration: %d", event); /* go back to main channel to report error */ coroutine_yieldto(mig->from, NULL); } diff --git a/gtk/spice-session.c b/gtk/spice-session.c index 38a1e92..959e099 100644 --- a/gtk/spice-session.c +++ b/gtk/spice-session.c @@ -1258,7 +1258,11 @@ void spice_session_abort_migration(SpiceSession *session) struct channel *c; g_return_if_fail(s != NULL); - g_return_if_fail(s->migration != NULL); + + if (s->migration == NULL) { + SPICE_DEBUG("no migration in progress"); + return; + } for (ring = ring_get_head(&s->channels); ring != NULL; ring = next) { |