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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-21 00:14:20 +01:00
parent d90f7b4228 566b0f9f34
commit 4af96e1b6d
22 changed files with 160 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/hdd_menu.cpp
View File

@@ -342,8 +342,8 @@ bool CHDDMenuHandler::waitfordev(std::string dev, int maxwait)
void CHDDMenuHandler::showHint(std::string &message)
{
CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, message.c_str());
hintBox->paint();
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, message.c_str());
hintBox.paint();
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(3);
neutrino_msg_t msg;
@@ -361,7 +361,7 @@ void CHDDMenuHandler::showHint(std::string &message)
else if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::cancel_all)
break;
}
delete hintBox;
hintBox.hide();
}
void CHDDMenuHandler::setRecordPath(std::string &dev)
@@ -493,8 +493,8 @@ int CHDDMenuHandler::exec(CMenuTarget* parent, const std::string &actionkey)
if (actionkey[0] == 'm') {
for (std::vector<hdd_s>::iterator it = hdd_list.begin(); it != hdd_list.end(); ++it) {
if (it->devname == dev) {
CHintBox * hintbox = new CHintBox(it->mounted ? LOCALE_HDD_UMOUNT : LOCALE_HDD_MOUNT, it->devname.c_str());
hintbox->paint();
CHintBox hintbox(it->mounted ? LOCALE_HDD_UMOUNT : LOCALE_HDD_MOUNT, it->devname.c_str());
hintbox.paint();
if (it->mounted)
umount_dev(it->devname);
else
@@ -502,7 +502,7 @@ int CHDDMenuHandler::exec(CMenuTarget* parent, const std::string &actionkey)
it->mounted = is_mounted(it->devname.c_str());
it->cmf->setOption(it->mounted ? umount : mount);
delete hintbox;
hintbox.hide();
return menu_return::RETURN_REPAINT;
}
}