[Companion] Speed up/fix findMassstoragePath(): Use Qt methods when available (v5.4+) and only check for path on FAT[32] file systems; For older Qt, skip root (/), /net, /proc, & /run devices on Linux/macOS; Fixes long delay on eg. macOS due to network access. Remove unused #include "mountlist.h" in process_flash.cpp. (#4937)
This commit is contained in:
committed by
Bertrand Songis
parent
1a85956dcb
commit
69576cb17d
@@ -34,7 +34,6 @@
|
||||
#define sleep(x) Sleep(x*1000)
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#include "mountlist.h"
|
||||
#endif
|
||||
|
||||
FlashProcess::FlashProcess(const QString &cmd, const QStringList &args, ProgressWidget *progress):
|
||||
@@ -240,7 +239,7 @@ void FlashProcess::onReadyReadStandardError()
|
||||
void FlashProcess::errorWizard()
|
||||
{
|
||||
QString output = progress->getText();
|
||||
|
||||
|
||||
if (output.contains("avrdude: Expected signature for")) { // wrong signature
|
||||
int pos = output.indexOf("avrdude: Device signature = ");
|
||||
bool fwexist = false;
|
||||
|
||||
Reference in New Issue
Block a user