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

fix conflict

Browse Source 
Origin commit data
------------------
Commit: 5dd54caf54
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
This commit is contained in:
[CST] Focus
2012-06-18 14:56:17 +04:00
parent daa53c6394 b344259b06
commit 73ac1950c2
32 changed files with 98 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/update.cpp
View File

@@ -606,6 +606,8 @@ void CFlashExpert::writemtd(const std::string & filename, int mtdNumber)
void CFlashExpert::showMTDSelector(const std::string & actionkey)
{
int shortcut = 0;
mn_widget_id_t widget_id = NO_WIDGET_ID;
if (actionkey == "readmtd")
widget_id = MN_WIDGET_ID_MTDREAD_SELECTOR;
@@ -624,7 +626,7 @@ void CFlashExpert::showMTDSelector(const std::string & actionkey)
if ((actionkey == "writemtd") && (lx == 0))
enabled = false;
sprintf(sActionKey, "%s%d", actionkey.c_str(), lx);
mtdselector->addItem(new CMenuForwarderNonLocalized(mtdInfo->getMTDName(lx).c_str(), enabled, NULL, this, sActionKey));
mtdselector->addItem(new CMenuForwarderNonLocalized(mtdInfo->getMTDName(lx).c_str(), enabled, NULL, this, sActionKey, CRCInput::convertDigitToKey(shortcut++)));
}
mtdselector->exec(NULL,"");
delete mtdselector;