v1.1.2

CHANGELOG.md

@@ -8,7 +8,7 @@
 
 ## Bundled Versions
 * [`P2Pool v3.0`](https://github.com/SChernykh/p2pool/releases/tag/v3.0)
-* [`XMRig v6.18.1`](https://github.com/xmrig/xmrig/releases/tag/v6.18.1)
+* [`XMRig v6.19.0`](https://github.com/xmrig/xmrig/releases/tag/v6.19.0)
 
 
 ---

Cargo.lock

@@ -1175,7 +1175,9 @@ dependencies = [
  "egui",
  "egui-wgpu",
  "egui-winit",
+ "egui_glow",
  "getrandom 0.2.8",
+ "glow",
  "glutin",
  "js-sys",
  "percent-encoding",
@@ -1239,6 +1241,21 @@ dependencies = [
  "image",
 ]
 
+[[package]]
+name = "egui_glow"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad77d4a00402bae9658ee64be148f4b2a0b38e4fc7874970575ca01ed1c5b75d"
+dependencies = [
+ "bytemuck",
+ "egui",
+ "glow",
+ "memoffset 0.6.5",
+ "tracing",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "either"
 version = "1.8.1"

Cargo.toml

@@ -66,16 +66,17 @@ serde-xml-rs = "0.6.0"
 
 # Unix dependencies
 [target.'cfg(unix)'.dependencies]
-ef
 tar = "0.4.38"
 flate2 = "1.0"
 sudo = "0.6.0"
+## [glow] backend for Unix.
 eframe = { version = "0.19.0", default-features = false, features = ["glow"] }
 
 # Windows dependencies
 [target.'cfg(windows)'.dependencies]
 zip = "0.6.3"
 is_elevated = "0.1.2"
+## [wgpu] backend for Windows.
 eframe = { version = "0.19.0", default-features = false, features = ["wgpu"] }
 
 # For Windows build (icon)

src/constants.rs

@@ -17,7 +17,7 @@
 
 pub const GUPAX_VERSION:  &str = concat!("v", env!("CARGO_PKG_VERSION")); // e.g: v1.0.0
 pub const P2POOL_VERSION: &str = "v3.0";
-pub const XMRIG_VERSION:  &str = "v6.18.1";
+pub const XMRIG_VERSION:  &str = "v6.19.0";
 pub const COMMIT:         &str = include_str!("../.git/refs/heads/main");
 // e.g: Gupax_v1_0_0
 // Would have been [Gupax_v1.0.0] but P2Pool truncates everything after [.]

src/helper.rs

@@ -618,7 +618,6 @@ impl Helper {
 			let mut lock = lock!(process);
 			if !lock.input.is_empty() {
 				let input = std::mem::take(&mut lock.input);
-				drop(lock);
 				for line in input {
 					if line.is_empty() { continue }
 					debug!("P2Pool Watchdog | User input not empty, writing to STDIN: [{}]", line);
@@ -638,6 +637,7 @@ impl Helper {
 					if let Err(e) = stdin.flush() { error!("P2Pool Watchdog | STDIN flush error: {}", e); }
 				}
 			}
+			drop(lock);
 
 			// Check if logs need resetting
 			debug!("P2Pool Watchdog | Attempting GUI log reset check");
@@ -1011,7 +1011,6 @@ impl Helper {
 			let mut lock = lock!(process);
 			if !lock.input.is_empty() {
 				let input = std::mem::take(&mut lock.input);
-				drop(lock);
 				for line in input {
 					if line.is_empty() { continue }
 					debug!("XMRig Watchdog | User input not empty, writing to STDIN: [{}]", line);
@@ -1023,6 +1022,7 @@ impl Helper {
 					if let Err(e) = stdin.flush() { error!("XMRig Watchdog | STDIN flush error: {}", e); }
 				}
 			}
+			drop(lock);
 
 			// Check if logs need resetting
 			debug!("XMRig Watchdog | Attempting GUI log reset check");

src/main.rs

@@ -753,12 +753,6 @@ fn init_options(initial_window_size: Option<Vec2>) -> NativeOptions {
 	options.initial_window_size = initial_window_size;
 	options.follow_system_theme = false;
 	options.default_theme = eframe::Theme::Dark;
-
-	#[cfg(target_os = "windows")]
-	options.renderer = eframe::Renderer::Wgpu;
-	#[cfg(target_family = "unix")]
-	options.renderer = eframe::Renderer::Glow;
-
 	let icon = image::load_from_memory(BYTES_ICON).expect("Failed to read icon bytes").to_rgba8();
 	let (icon_width, icon_height) = icon.dimensions();
 	options.icon_data = Some(eframe::IconData {