mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
fix conflict
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:
@@ -982,7 +982,7 @@ bool CFileBrowser::exec(const char * const dirname)
|
||||
}
|
||||
else
|
||||
#endif
|
||||
if (selections.size() > 0)
|
||||
if (!selections.empty())
|
||||
{
|
||||
ChangeDir("..",selections.back());
|
||||
selections.pop_back();
|
||||
@@ -1042,7 +1042,7 @@ bool CFileBrowser::exec(const char * const dirname)
|
||||
else
|
||||
#endif
|
||||
{
|
||||
if (selections.size() > 0)
|
||||
if ( !selections.empty() )
|
||||
{
|
||||
ChangeDir("..",selections.back());
|
||||
selections.pop_back();
|
||||
|
Reference in New Issue
Block a user