diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2012-02-10 07:16:27 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2012-02-10 07:16:27 +0000 |
| commit | 18e04269fb72624845a5cc416e6d13dc7d714e82 (patch) | |
| tree | 3c28cad4911ea71a7986653104136718be458f46 /ui/gtk/rtp_player.c | |
| parent | 4e1637e67c7d79c46fed58997f87b73beb7da318 (diff) | |
Sean Bright <sean.bright@gmail.com>:
In r37159, the following change was made to ui/gtk/rtp_player.c:
@@ -1654,9 +1636,7 @@
GtkWidget *dialog;
/* we should never be here if we are in PLAY and !PAUSE */
- if(!rtp_channels->stop&& !rtp_channels->pause){
- exit(10);
- }
+ g_assert(!rtp_channels->stop&& !rtp_channels->pause);
The logic, however, was not negated properly. The correct assertion should be:
g_assert(rtp_channels->stop || rtp_channels->pause);
With the current code, the RTP player causes a crash for me when pressing the
'Play' button.
svn path=/trunk/; revision=40951
Diffstat (limited to 'ui/gtk/rtp_player.c')
| -rw-r--r-- | ui/gtk/rtp_player.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c index e7cdad7573..839e9135c9 100644 --- a/ui/gtk/rtp_player.c +++ b/ui/gtk/rtp_player.c @@ -1864,7 +1864,7 @@ play_channels(void) GtkWidget *dialog; /* we should never be here if we are in PLAY and !PAUSE */ - g_assert(!rtp_channels->stop && !rtp_channels->pause); + g_assert(rtp_channels->stop || rtp_channels->pause); /* if we are in PAUSE change the state */ if (rtp_channels->pause) { |