Merge with master

3b60ab27 · Don Gagne · e4434dc9 · 5b2057c0 · 3b60ab27 · 3b60ab27
Commit 3b60ab27 authored May 06, 2015 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

FileManager.cc src/uas/FileManager.cc +0 -1

FileManager.h src/uas/FileManager.h +0 -1

No files found.
--- a/src/uas/FileManager.cc
+++ b/src/uas/FileManager.cc
@@ -622,7 +622,6 @@ void FileManager::_ackTimeout(void)
            _currentOperation = kCOAck;
            _writeFileAccumulator.clear();
            _emitErrorMessage(tr("Timeout waiting for ack: Sending Terminate command"));
-            _sendTerminateCommand();
            break;
 			
        default:

--- a/src/uas/FileManager.h
+++ b/src/uas/FileManager.h
@@ -61,7 +61,6 @@ public:
 	///		@param dirPath Fully qualified path to list
 	void listDirectory(const QString& dirPath);
 	
-    
    /// Upload the specified file to the specified location
    void uploadPath(const QString& toPath, const QFileInfo& uploadFile);