From af720f735291c730059df2588a48dec50c3e9a7c Mon Sep 17 00:00:00 2001 From: Andrea Date: Thu, 9 Jan 2020 22:12:51 +0000 Subject: [PATCH] Correct way to clear a std::string. (PR #723) --- source/Harddisk.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/Harddisk.cpp b/source/Harddisk.cpp index 3ba8af50..ecb3ac59 100644 --- a/source/Harddisk.cpp +++ b/source/Harddisk.cpp @@ -190,9 +190,9 @@ static void HD_CleanupDrive(const int iDrive) g_HardDisk[iDrive].hd_imageloaded = false; - g_HardDisk[iDrive].imagename[0] = 0; - g_HardDisk[iDrive].fullname[0] = 0; - g_HardDisk[iDrive].strFilenameInZip = ""; + g_HardDisk[iDrive].imagename.clear(); + g_HardDisk[iDrive].fullname.clear(); + g_HardDisk[iDrive].strFilenameInZip.clear(); HD_SaveLastDiskImage(iDrive); } @@ -783,8 +783,8 @@ static bool HD_LoadSnapshotHDDUnit(YamlLoadHelper& yamlLoadHelper, UINT unit) if (!yamlLoadHelper.GetSubMap(hddUnitName)) throw std::string("Card: Expected key: ") + hddUnitName; - g_HardDisk[unit].fullname[0] = 0; - g_HardDisk[unit].imagename[0] = 0; + g_HardDisk[unit].fullname.clear(); + g_HardDisk[unit].imagename.clear(); g_HardDisk[unit].hd_imageloaded = false; // Default to false (until image is successfully loaded below) g_HardDisk[unit].hd_status_next = DISK_STATUS_OFF; g_HardDisk[unit].hd_status_prev = DISK_STATUS_OFF;