Merge branch 'master' of github.com:ngscopeclient/scopehal-apps

azonenberg · azonenberg · commit f35122d9fe71 · 2025-03-02T09:03:57.000-08:00
diff --git a/lib b/lib
@@ -1 +1 @@
-Subproject commit 4301b4ff3d38f947bbf0abf60683bdbebeb95a1b
+Subproject commit fef28c88939b3bc10ff94f05807890f12af4a628
diff --git a/src/ngscopeclient/HistoryManager.cpp b/src/ngscopeclient/HistoryManager.cpp
@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2024 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -367,7 +367,10 @@ bool HistoryManager::HasHistory(TimePoint t)
 /**
 	@brief Called when we run out of memory
  */
-bool HistoryManager::OnMemoryPressure(MemoryPressureLevel level, MemoryPressureType type, size_t requestedSize)
+bool HistoryManager::OnMemoryPressure(
+	[[maybe_unused]] MemoryPressureLevel level,
+	MemoryPressureType type,
+	[[maybe_unused]] size_t requestedSize)
 {
 	LogDebug("HistoryManager::OnMemoryPressure\n");
 	LogIndenter li;
diff --git a/src/ngscopeclient/ngscopeclient.desktop b/src/ngscopeclient/ngscopeclient.desktop
@@ -4,3 +4,4 @@ Name=ngscopeclient
 Type=Application
 Exec=ngscopeclient
 Categories=Development;Electronics
+Terminal=false
