summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md6
-rw-r--r--Makefile12
-rw-r--r--src/btop.cpp2
3 files changed, 12 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df17abe..7354364 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.0.9
+
+* Added: ifstream check and try-catch for stod() in Tools::system_uptime()
+
+* Fixed: Freeze on cin.ignore()
+
## v1.0.8
* Fixed: Additional NULL checks in UTF-8 detection
diff --git a/Makefile b/Makefile
index 0cca16b..e6b4d44 100644
--- a/Makefile
+++ b/Makefile
@@ -40,13 +40,11 @@ override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
#? Try to make sure we are using GCC/G++ version 11 or later if not instructed to use g++-10
ifeq ($(CXX),g++)
- ifneq ($(CXX),g++-10)
- V_MAJOR := $(shell echo $(CXX_VERSION) | cut -f1 -d".")
- ifneq ($(shell test $(V_MAJOR) -ge 11; echo $$?),0)
- ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
- override CXX := g++-11
- override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
- endif
+ V_MAJOR := $(shell echo $(CXX_VERSION) | cut -f1 -d".")
+ ifneq ($(shell test $(V_MAJOR) -ge 11; echo $$?),0)
+ ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
+ override CXX := g++-11
+ override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
endif
endif
endif
diff --git a/src/btop.cpp b/src/btop.cpp
index da97bda..af2ffcf 100644
--- a/src/btop.cpp
+++ b/src/btop.cpp
@@ -55,7 +55,7 @@ namespace Global {
{"#801414", "██████╔╝ ██║ ╚██████╔╝██║ ╚═╝ ╚═╝"},
{"#000000", "╚═════╝ ╚═╝ ╚═════╝ ╚═╝"},
};
- const string Version = "1.0.8";
+ const string Version = "1.0.9";
int coreCount;
string overlay;