Merge commit 'origin/1.0-bugfix'

74e5a072 · Derk-Jan Hartman · c5c06b64 · 8d5c7570 · 74e5a072
Commit 74e5a072 authored May 26, 2009 by Derk-Jan Hartman
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

modules/gui/macosx/vout.m modules/gui/macosx/vout.m +0 -1

No files found.
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -458,7 +458,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
    if( !VLCIntf || !VLCIntf->p_sys )
        return;

-    UInt8 UsrActivity;
    if( VLCIntf->p_sys->i_play_status == PLAYING_S )
        UpdateSystemActivity( UsrActivity );
 }