Commit 2bab8d94 authored by Benjamin Dobell's avatar Benjamin Dobell

Merge pull request #330 from kratz00/misc_fixes

Minor bug fixes.
parents a59a290e 34c4636e
......@@ -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)
......
......@@ -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('.'));
......
......@@ -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);
}
......
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