mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/channellist.cpp: disable timeshift stop while timeshift playback in progress

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6424534e8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2015-01-21 17:54:11 +03:00
parent 957416a392
commit db4de60b78
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/channellist.cpp
View File

@@ -51,6 +51,7 @@
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
#include <gui/widget/messagebox.h> #include <gui/widget/messagebox.h>
#include <gui/widget/hintbox.h> #include <gui/widget/hintbox.h>
#include <gui/movieplayer.h>
#include <system/settings.h> #include <system/settings.h>
#include <gui/customcolor.h> #include <gui/customcolor.h>
@@ -651,7 +652,11 @@ int CChannelList::show()
} }
} }
else if(!edit_state && !empty && msg == CRCInput::RC_stop ) { //stop recording else if(!edit_state && !empty && msg == CRCInput::RC_stop ) { //stop recording
if(CRecordManager::getInstance()->RecordingStatus((*chanlist)[selected]->channel_id)) //if(CRecordManager::getInstance()->RecordingStatus((*chanlist)[selected]->channel_id))
int recmode = CRecordManager::getInstance()->GetRecordMode((*chanlist)[selected]->channel_id);
bool timeshift = recmode & CRecordManager::RECMODE_TSHIFT;
bool tsplay = CMoviePlayerGui::getInstance().timeshift;
if (recmode && !(timeshift && tsplay))
{ {
if (CRecordManager::getInstance()->AskToStop((*chanlist)[selected]->channel_id)) if (CRecordManager::getInstance()->AskToStop((*chanlist)[selected]->channel_id))
{ {