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

fix conflict

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5dd54caf54
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-06-18 14:56:17 +04:00
parent 1f992505f7 8f4a18acf5
commit 0e9750eac5
32 changed files with 98 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/filebrowser.cpp
View File

@@ -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();