Ecosystem/gupaxx
1
0
Fork 0
mirror of https://github.com/Cyrix126/gupaxx.git synced 2024-12-22 22:59:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6 from maddymodd/gui-mod

Browse source 
Fix spelling of the term "unrecoverable", also update gitignore for mac
This commit is contained in:
hinto-janaiyo 2023-01-06 16:12:58 +00:00 committed by GitHub
commit a3fd88252d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1 +1,3 @@
/target /target
.DS_Store

2
README.md
View file

@ -292,7 +292,7 @@ Long-term state is saved onto the disk in the "OS data folder", using the [TOML]
Given a slightly corrupted `state.toml` file, Gupax will attempt to merge it with a new default one. This will most likely happen if the internal data structure of `state.toml` is changed in the future (e.g removing an outdated setting). The node/pool database cannot be merged. Given a slightly corrupted `state.toml` file, Gupax will attempt to merge it with a new default one. This will most likely happen if the internal data structure of `state.toml` is changed in the future (e.g removing an outdated setting). The node/pool database cannot be merged.
If Gupax can't read/write to disk at all, or if there are any other big issues, it will show an un-recoverable error screen. If Gupax can't read/write to disk at all, or if there are any other big issues, it will show an unrecoverable error screen.
| OS | Data Folder | Example | | OS | Data Folder | Example |
|----------|------------------------------------------|-------------------------------------------------| |----------|------------------------------------------|-------------------------------------------------|

2
src/main.rs
View file

@ -1255,7 +1255,7 @@ impl eframe::App for App {
}, },
_ => { _ => {
match self.error_state.ferris { match self.error_state.ferris {
Panic => ui.add_sized([width, height], Label::new("--- Gupax has encountered an un-recoverable error! ---")), Panic => ui.add_sized([width, height], Label::new("--- Gupax has encountered an unrecoverable error! ---")),
Happy => ui.add_sized([width, height], Label::new("--- Success! ---")), Happy => ui.add_sized([width, height], Label::new("--- Success! ---")),
_ => ui.add_sized([width, height], Label::new("--- Gupax has encountered an error! ---")), _ => ui.add_sized([width, height], Label::new("--- Gupax has encountered an error! ---")),
}; };