From b8463b9203d64314a6ed2b603efe34d1a87fc900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 24 Mar 2026 10:26:34 -0600
Subject: [PATCH] Fix assorted warnings, bump Cargo.lock

---
 Core/FileSystems/ISOFileSystem.h |  2 +-
 Tools/langtool/Cargo.lock        | 32 +++++++++++++++++++++++++++-----
 UI/AdhocServerScreen.cpp         |  2 +-
 UI/MainScreen.cpp                |  3 ---
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/Core/FileSystems/ISOFileSystem.h b/Core/FileSystems/ISOFileSystem.h
index f1e68ee361..f94746ebc2 100644
--- a/Core/FileSystems/ISOFileSystem.h
+++ b/Core/FileSystems/ISOFileSystem.h
@@ -167,7 +167,7 @@ public:
 	bool ComputeRecursiveDirSizeIfFast(const std::string &path, int64_t *size) override { return false; }
 
 	void Describe(char *buf, size_t size) const override { snprintf(buf, size, "ISOBlock"); }
-	std::shared_ptr<BlockDevice> GetBlockDevice() { return isoFileSystem_->GetBlockDevice(); }
+	std::shared_ptr<BlockDevice> GetBlockDevice() override { return isoFileSystem_->GetBlockDevice(); }
 
 private:
 	std::shared_ptr<IFileSystem> isoFileSystem_;
diff --git a/Tools/langtool/Cargo.lock b/Tools/langtool/Cargo.lock
index 7f5f8295e7..cf061d355b 100644
--- a/Tools/langtool/Cargo.lock
+++ b/Tools/langtool/Cargo.lock
@@ -766,9 +766,9 @@ checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 
 [[package]]
 name = "iri-string"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
+checksum = "d8e7418f59cc01c88316161279a7f665217ae316b388e58a0d10e29f54f1e5eb"
 dependencies = [
  "memchr",
  "serde",
@@ -795,7 +795,7 @@ dependencies = [
  "cesu8",
  "cfg-if",
  "combine",
- "jni-sys",
+ "jni-sys 0.3.1",
  "log",
  "thiserror 1.0.69",
  "walkdir",
@@ -804,9 +804,31 @@ dependencies = [
 
 [[package]]
 name = "jni-sys"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.117",
+]
 
 [[package]]
 name = "jobserver"
diff --git a/UI/AdhocServerScreen.cpp b/UI/AdhocServerScreen.cpp
index 1566e22ad2..6570029d9d 100644
--- a/UI/AdhocServerScreen.cpp
+++ b/UI/AdhocServerScreen.cpp
@@ -49,7 +49,7 @@ public:
 			*outEditValue_ = editValue_;
 		}
 	}
-	virtual bool CanComplete(DialogResult result) { return result == DR_OK ? !editValue_.empty() : true; }
+	virtual bool CanComplete(DialogResult result) override { return result == DR_OK ? !editValue_.empty() : true; }
 
 	const char *tag() const override { return "AdhocAddServerPopup"; }
 
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 8e7ca540b8..c7cc7070b0 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -300,9 +300,6 @@ void GameButton::Draw(UIContext &dc) {
 	if (down_) {
 		style = dc.GetTheme().itemDownStyle;
 	}
-	if (startsWith(ginfo->GetTitle(), "Nddemo")) {
-		style = style;
-	}
 
 	// Some types we just draw a default icon for.
 	ImageID imageIcon = ImageID::invalid();