mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +02:00
fix conflict
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