workflows revised, updated screenshot, e2db: maker, merge to fix

.github/workflows/build-win32.yml

@@ -28,6 +28,7 @@ jobs:
       uses: msys2/setup-msys2@v2
       with:
         msystem: MINGW32
+        update: true
         pacboy: >-
           cc:i cmake:i ninja:i qt5-base:i qt5-translations:i curl:i
 

.github/workflows/build-win64.yml

@@ -27,6 +27,8 @@ jobs:
     - name: Setup MSYS2
       uses: msys2/setup-msys2@v2
       with:
+        msystem: MINGW64
+        update: true
         pacboy: >-
           cc:x cmake:x ninja:x qt6-base:x qt6-translations:x curl:x
 

dist/linux/snapcraft.yaml

@@ -19,7 +19,7 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DRELEASE_MEDIUM=snap
+      - -DRELEASE_MEDIUM=snapstore
       - -DWITHOUT_CLI=ON
     build-packages:
       - build-essential

src/e2db/e2db_maker.cpp

@@ -852,26 +852,32 @@ void e2db_maker::make_tunersets_xml(string filename, int ytype, e2db_file& file)
 
 	//TODO FIX out of range substr (ie. merge without services file)
 
-	if (comments.count(iname))
+	try
 	{
-		int i = 0;
-		size_t pos = 0;
-		for (auto & s : comments[iname])
+		if (comments.count(iname))
 		{
-			string line;
-			while (s.ln != i)
+			int i = 0;
+			size_t pos = 0;
+			for (auto & s : comments[iname])
 			{
-				std::getline(ss, line, '>');
-				pos += line.size() + 1;
-				i++;
+				string line;
+				while (s.ln != i)
+				{
+					std::getline(ss, line, '>');
+					pos += line.size() + 1;
+					i++;
+				}
+				line = "<!--" + s.text + "-->";
+				if (s.type) // multiline
+					line = '\n' + line;
+				str = str.substr(0, pos) + line + str.substr(pos);
+				pos += line.size();
 			}
-			line = "<!--" + s.text + "-->";
-			if (s.type) // multiline
-				line = '\n' + line;
-			str = str.substr(0, pos) + line + str.substr(pos);
-			pos += line.size();
 		}
 	}
+	catch (...)
+	{
+	}
 
 	file.filename = filename;
 	file.mime = "text/xml";