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

fix logic check null and add mute to skip

Browse Source 
Origin commit data
------------------
Commit: 89f51df9e7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-19 (Thu, 19 May 2016)
This commit is contained in:
Jacek Jendrzej
2016-05-19 15:56:49 +02:00
parent 5b9ab4a91b
commit 0e2678b648
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/widget/messagebox.cpp
View File

@@ -271,7 +271,7 @@ int CMessageBox::exec(int timeout)
{ {
loop = false; loop = false;
} }
else if((msg == CRCInput::RC_sat) || (msg == CRCInput::RC_favorites) || (msg == CRCInput::RC_www)) else if((msg == CRCInput::RC_sat) || (msg == CRCInput::RC_favorites) || (msg == CRCInput::RC_www) || (msg == CRCInput::RC_spkr) )
{ {
} }
else if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::cancel_all) else if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::cancel_all)
@@ -290,7 +290,7 @@ int CMessageBox::exec(int timeout)
int ShowMsg(const neutrino_locale_t Caption, const char * const Text, const CMessageBox::result_ &Default, const uint32_t ShowButtons, const char * const Icon, const int Width, const int timeout, bool returnDefaultOnTimeout) int ShowMsg(const neutrino_locale_t Caption, const char * const Text, const CMessageBox::result_ &Default, const uint32_t ShowButtons, const char * const Icon, const int Width, const int timeout, bool returnDefaultOnTimeout)
{ {
std::string tmpText = "msg error"; std::string tmpText = "msg error";
if(!Text) if(Text)
tmpText = Text; tmpText = Text;
CMessageBox* messageBox = new CMessageBox(Caption, tmpText.c_str(), Width, Icon, Default, ShowButtons); CMessageBox* messageBox = new CMessageBox(Caption, tmpText.c_str(), Width, Icon, Default, ShowButtons);
messageBox->returnDefaultValueOnTimeout(returnDefaultOnTimeout); messageBox->returnDefaultValueOnTimeout(returnDefaultOnTimeout);
@@ -304,7 +304,7 @@ int ShowMsg(const neutrino_locale_t Caption, const char * const Text, const CMes
int ShowMsg(const std::string &Caption, const char * const Text, const CMessageBox::result_ &Default, const uint32_t ShowButtons, const char * const Icon, const int Width, const int timeout, bool returnDefaultOnTimeout) int ShowMsg(const std::string &Caption, const char * const Text, const CMessageBox::result_ &Default, const uint32_t ShowButtons, const char * const Icon, const int Width, const int timeout, bool returnDefaultOnTimeout)
{ {
std::string tmpText = "msg error"; std::string tmpText = "msg error";
if(!Text) if(Text)
tmpText = Text; tmpText = Text;
CMessageBox* messageBox = new CMessageBox(Caption, tmpText.c_str(), Width, Icon, Default, ShowButtons); CMessageBox* messageBox = new CMessageBox(Caption, tmpText.c_str(), Width, Icon, Default, ShowButtons);
messageBox->returnDefaultValueOnTimeout(returnDefaultOnTimeout); messageBox->returnDefaultValueOnTimeout(returnDefaultOnTimeout);