diff options
| author | Benjamin Dobell <benjamin.dobell+github@glassechidna.com.au> | 2016-03-01 17:57:37 +1100 |
|---|---|---|
| committer | Benjamin Dobell <benjamin.dobell+github@glassechidna.com.au> | 2016-03-01 17:57:37 +1100 |
| commit | 2bab8d9473cc237f6665a9cfe784942e0a2038e8 (patch) | |
| tree | 66290929ce2f418bc4140136751719fc01c565c2 | |
| parent | a59a290e235b5ee939039ce4920e39d1057a4635 (diff) | |
| parent | 34c4636ee0a8ef9857b23e2257b670d14b2dfb8a (diff) | |
| download | external_heimdall-2bab8d9473cc237f6665a9cfe784942e0a2038e8.zip external_heimdall-2bab8d9473cc237f6665a9cfe784942e0a2038e8.tar.gz external_heimdall-2bab8d9473cc237f6665a9cfe784942e0a2038e8.tar.bz2 | |
Merge pull request #330 from kratz00/misc_fixes
Minor bug fixes.
| -rw-r--r-- | cmake/Findlibusb.cmake | 4 | ||||
| -rw-r--r-- | heimdall-frontend/source/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | heimdall/source/FlashAction.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cmake/Findlibusb.cmake b/cmake/Findlibusb.cmake index 69811bc..3e21b98 100644 --- a/cmake/Findlibusb.cmake +++ b/cmake/Findlibusb.cmake @@ -10,10 +10,10 @@ find_path(LIBUSB_INCLUDE_DIR ) if (libusb_USE_STATIC_LIBS AND NOT MSVC) - set (LIBUSB_LIB_PREFIX "lib" CACHE INTERNAL "libusb library name prefox passed to find_library") + set (LIBUSB_LIB_PREFIX "lib" CACHE INTERNAL "libusb library name prefix passed to find_library") set (LIBUSB_LIB_SUFFIX ".a" CACHE INTERNAL "libusb library name suffix passed to find_library") else (libusb_USE_STATIC_LIBS AND NOT MSVC) - set (LIBUSB_LIB_PREFIX "" CACHE INTERNAL "libusb library name prefox passed to find_library") + set (LIBUSB_LIB_PREFIX "" CACHE INTERNAL "libusb library name prefix passed to find_library") set (LIBUSB_LIB_SUFFIX "" CACHE INTERNAL "libusb library name suffix passed to find_library") endif (libusb_USE_STATIC_LIBS AND NOT MSVC) diff --git a/heimdall-frontend/source/mainwindow.cpp b/heimdall-frontend/source/mainwindow.cpp index e110d69..f06fb4e 100644 --- a/heimdall-frontend/source/mainwindow.cpp +++ b/heimdall-frontend/source/mainwindow.cpp @@ -131,7 +131,7 @@ bool MainWindow::ReadPit(QFile *file) file->close(); bool success = currentPitData.Unpack(buffer); - delete buffer; + delete[] buffer; if (!success) currentPitData.Clear(); @@ -659,7 +659,7 @@ void MainWindow::SelectPartitionName(int index) partitionFileGroup->setTitle(title); - if (!fileInfo.GetFilename().isEmpty()) + if (pitEntry && !fileInfo.GetFilename().isEmpty()) { QString partitionFilename = pitEntry->GetFlashFilename(); int lastPeriod = partitionFilename.lastIndexOf(QChar('.')); diff --git a/heimdall/source/FlashAction.cpp b/heimdall/source/FlashAction.cpp index 590e0b5..d9203b0 100644 --- a/heimdall/source/FlashAction.cpp +++ b/heimdall/source/FlashAction.cpp @@ -185,7 +185,7 @@ static bool sendTotalTransferSize(BridgeManager *bridgeManager, const vector<Par if (totalBytesResult != 0) { - Interface::PrintError("Unexpected session total bytes response!\nExpected: 0\nReceived:%d\n", totalBytesResponse); + Interface::PrintError("Unexpected session total bytes response!\nExpected: 0\nReceived:%d\n", totalBytesResult); return (false); } |