Merge lp:~xapantu/noise/fix-1158241 into lp:~elementary-apps/noise/trunk

Proposed by xapantu
Status: Merged
Approved by: Raphael Isemann
Approved revision: 1655
Merged at revision: 1656
Proposed branch: lp:~xapantu/noise/fix-1158241
Merge into: lp:~elementary-apps/noise/trunk
Diff against target: 26 lines (+3/-7)
1 file modified
src/FileOperator.vala (+3/-7)
To merge this branch: bzr merge lp:~xapantu/noise/fix-1158241
Reviewer Review Type Date Requested Status
Raphael Isemann (community) functionality, code-style Approve
Review via email: mp+229925@code.launchpad.net

Commit message

End of the fix for #1158241, unit tests are coming in a separate branch.

Remove useless code and unneeded else if, probably a bad indentation error.

Description of the change

"End of the fix for #1158241, unit tests are coming in a separate branch.

Remove useless code and unneeded else if, probably a bad indentation error.

To post a comment you must log in.
Revision history for this message
Raphael Isemann (teemperor) wrote :

Works fine and codestyle is fine.

review: Approve (functionality, code-style)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/FileOperator.vala'
2--- src/FileOperator.vala 2014-07-02 17:56:43 +0000
3+++ src/FileOperator.vala 2014-08-07 12:07:08 +0000
4@@ -324,13 +324,9 @@
5
6 if (index == queue_size) {
7 queue_finished ();
8- } else if (new_imports.size >= 200) {
9- libraries_manager.local_library.add_medias (new_imports); // give user some feedback
10- new_imports.clear ();
11- } else if (index == 1) {
12- libraries_manager.local_library.add_medias (new_imports); // give user the first feedback
13- new_imports.clear ();
14 }
15+ libraries_manager.local_library.add_medias (new_imports);
16+ new_imports.clear ();
17 }
18
19 void import_error (string file) {
20@@ -391,4 +387,4 @@
21 return false;
22 });
23 }
24-}
25\ No newline at end of file
26+}

Subscribers

People subscribed via source and target branches