Commit 4bdd926e authored by Laurent Aimar's avatar Laurent Aimar

Fixed missing unlock in case of error (timeshift).

parent 75c6fc8a
...@@ -59,8 +59,6 @@ enum ...@@ -59,8 +59,6 @@ enum
C_SEND, C_SEND,
C_DEL, C_DEL,
C_CONTROL, C_CONTROL,
C_MAX
}; };
typedef struct typedef struct
...@@ -764,6 +762,8 @@ static void TsPushCmd( ts_thread_t *p_ts, ts_cmd_t *p_cmd ) ...@@ -764,6 +762,8 @@ static void TsPushCmd( ts_thread_t *p_ts, ts_cmd_t *p_cmd )
if( !p_storage ) if( !p_storage )
{ {
CmdClean( p_cmd ); CmdClean( p_cmd );
vlc_mutex_unlock( &p_ts->lock );
/* TODO warn the user (but only once) */
return; return;
} }
...@@ -779,6 +779,7 @@ static void TsPushCmd( ts_thread_t *p_ts, ts_cmd_t *p_cmd ) ...@@ -779,6 +779,7 @@ static void TsPushCmd( ts_thread_t *p_ts, ts_cmd_t *p_cmd )
} }
} }
/* TODO return error and warn the user (but only once) */
TsStoragePushCmd( p_ts->p_storage_w, p_cmd, p_ts->p_storage_r == p_ts->p_storage_w ); TsStoragePushCmd( p_ts->p_storage_w, p_cmd, p_ts->p_storage_r == p_ts->p_storage_w );
vlc_cond_signal( &p_ts->wait ); vlc_cond_signal( &p_ts->wait );
...@@ -1143,7 +1144,7 @@ static void TsStoragePopCmd( ts_storage_t *p_storage, ts_cmd_t *p_cmd ) ...@@ -1143,7 +1144,7 @@ static void TsStoragePopCmd( ts_storage_t *p_storage, ts_cmd_t *p_cmd )
} }
else else
{ {
fprintf( stderr, "----------------- 2: %m\n" ); //fprintf( stderr, "TsStoragePopCmd: %m\n" );
p_cmd->send.p_block = block_Alloc( 1 ); p_cmd->send.p_block = block_Alloc( 1 );
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment