Skip to content

Q
qgroundcontrol
Commit 3b60ab27 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Merge with master

parents e4434dc9 5b2057c0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
src/uas/FileManager.cc
View file @ 3b60ab27
...@@ -622,7 +622,6 @@ void FileManager::_ackTimeout(void) ...@@ -622,7 +622,6 @@ void FileManager::_ackTimeout(void)
_currentOperation = kCOAck; _currentOperation = kCOAck;
_writeFileAccumulator.clear(); _writeFileAccumulator.clear();
_emitErrorMessage(tr("Timeout waiting for ack: Sending Terminate command")); _emitErrorMessage(tr("Timeout waiting for ack: Sending Terminate command"));
_sendTerminateCommand();
break; break;
default: default:
......
src/uas/FileManager.h
View file @ 3b60ab27
...@@ -61,7 +61,6 @@ public: ...@@ -61,7 +61,6 @@ public:
/// @param dirPath Fully qualified path to list /// @param dirPath Fully qualified path to list
void listDirectory(const QString& dirPath); void listDirectory(const QString& dirPath);
/// Upload the specified file to the specified location /// Upload the specified file to the specified location
void uploadPath(const QString& toPath, const QFileInfo& uploadFile); void uploadPath(const QString& toPath, const QFileInfo& uploadFile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment