Ecosystem/gupaxx
1
0
Fork 0
mirror of https://github.com/Cyrix126/gupaxx.git synced 2024-11-16 23:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: simple mode hero not taken into account

Browse source
This commit is contained in:
Cyrix126 2024-11-02 16:42:33 +01:00
parent 5241d81f68
commit e1ba63e0d2
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/app/mod.rs
View file

@ -22,6 +22,7 @@ use crate::helper::p2pool::PubP2poolApi;
use crate::helper::xrig::xmrig::ImgXmrig; use crate::helper::xrig::xmrig::ImgXmrig;
use crate::helper::xrig::xmrig::PubXmrigApi; use crate::helper::xrig::xmrig::PubXmrigApi;
use crate::helper::xrig::xmrig_proxy::PubXmrigProxyApi; use crate::helper::xrig::xmrig_proxy::PubXmrigProxyApi;
use crate::helper::xvb::priv_stats::RuntimeMode;
use crate::helper::xvb::PubXvbApi; use crate::helper::xvb::PubXvbApi;
use crate::helper::Helper; use crate::helper::Helper;
use crate::helper::Process; use crate::helper::Process;
@ -596,7 +597,14 @@ impl App {
// Set saved Hero mode to runtime. // Set saved Hero mode to runtime.
debug!("Setting runtime_mode & runtime_manual_amount"); debug!("Setting runtime_mode & runtime_manual_amount");
app.xvb_api.lock().unwrap().stats_priv.runtime_mode = app.state.xvb.mode.clone().into(); // apply hero if simple mode saved with checkbox true, will let default to auto otherwise
if app.state.xvb.simple {
if app.state.xvb.simple_hero_mode {
app.xvb_api.lock().unwrap().stats_priv.runtime_mode = RuntimeMode::Hero
}
} else {
app.xvb_api.lock().unwrap().stats_priv.runtime_mode = app.state.xvb.mode.clone().into();
}
app.xvb_api.lock().unwrap().stats_priv.runtime_manual_amount = app.xvb_api.lock().unwrap().stats_priv.runtime_manual_amount =
app.state.xvb.manual_amount_raw; app.state.xvb.manual_amount_raw;
// Check if [P2pool.node] exists // Check if [P2pool.node] exists

10
src/app/panels/middle/xvb.rs
View file

@ -129,15 +129,13 @@ impl crate::disk::state::Xvb {
ui.style_mut().spacing.icon_spacing = space_h; ui.style_mut().spacing.icon_spacing = space_h;
// --------------------------- XVB Simple ------------------------------------------- // --------------------------- XVB Simple -------------------------------------------
if self.simple { if self.simple && ui.checkbox(&mut self.simple_hero_mode, "Hero Mode").on_hover_text(XVB_HERO_SELECT).clicked() {
// change rutime mode immediatly.
if ui.checkbox(&mut self.simple_hero_mode, "Hero Mode").on_hover_text(XVB_HERO_SELECT).clicked() { if self.simple_hero_mode {
// also change hero mode of runtime.
api.lock().unwrap().stats_priv.runtime_mode = RuntimeMode::Hero; api.lock().unwrap().stats_priv.runtime_mode = RuntimeMode::Hero;
} else { } else {
api.lock().unwrap().stats_priv.runtime_mode = RuntimeMode::Auto; api.lock().unwrap().stats_priv.runtime_mode = RuntimeMode::Auto;
} }
} }
}); });

1
src/helper/xvb/mod.rs
View file

@ -822,6 +822,7 @@ fn signal_interrupt(
} }
fn reset_data_xvb(pub_api: &Arc<Mutex<PubXvbApi>>, gui_api: &Arc<Mutex<PubXvbApi>>) { fn reset_data_xvb(pub_api: &Arc<Mutex<PubXvbApi>>, gui_api: &Arc<Mutex<PubXvbApi>>) {
let current_node = mem::take(&mut pub_api.lock().unwrap().current_node.clone()); let current_node = mem::take(&mut pub_api.lock().unwrap().current_node.clone());
// even if it is a restart, we want to keep set values by the user without the need from him to click on save button.
let runtime_mode = mem::take(&mut gui_api.lock().unwrap().stats_priv.runtime_mode); let runtime_mode = mem::take(&mut gui_api.lock().unwrap().stats_priv.runtime_mode);
let runtime_manual_amount = let runtime_manual_amount =
mem::take(&mut gui_api.lock().unwrap().stats_priv.runtime_manual_amount); mem::take(&mut gui_api.lock().unwrap().stats_priv.runtime_manual_amount);