Merge eaabc6479b into ac62ba9de1

Replaced:
an excellent (my own mistake) -> a very good (original)

Changed (vocabulary):
a mail -> an email

CONTRIBUTING.md

@@ -8,9 +8,9 @@
 
 * Split up multiple unrelated changes in multiple pull requests.
 
-* If it's a fix for a unreported bug, make a bug report and link the pull request.
+* If it's a fix for an unreported bug, make a bug report and link the pull request.
 
-* Purely cosmetic changes won't be accepted without a very good explanation of its value.
+* Pure cosmetic changes won't be accepted without a very good explanation of its value.
 
 ## Formatting
 
@@ -26,7 +26,7 @@
 
 ## General guidelines
 
-* Don't force a programming style. Use object oriented, functional, data oriented, etc., where it's suitable.
+* Don't force a programming style. Use object-oriented, functional, data-oriented, etc., where it's suitable.
 
 * Use [RAII](https://en.cppreference.com/w/cpp/language/raii).
 
@@ -38,7 +38,7 @@
 
 * Use descriptive names for variables.
 
-* Use comments if not very obvious what your code is doing.
+* Use comments if it is not very obvious what your code is doing.
 
 * Add comments as labels for what's currently happening in bigger sections of code for better readability.
 
@@ -48,6 +48,6 @@
 
 * Benchmark your code and look for alternatives if they cause a noticeable negative impact.
 
-For questions open a new discussion thread or send a mail to jakob@qvantnet.com
+For questions open a new discussion thread or send an email to jakob@qvantnet.com
 
 For proposing changes to this document create a [new issue](https://github.com/aristocratos/btop/issues/new/choose).

src/btop_theme.cpp

@@ -381,11 +381,16 @@ namespace Theme {
 			if (themefile.good()) {
 				Logger::debug("Loading theme file: " + filename);
 				while (not themefile.bad()) {
+					if (themefile.peek() == '#') {
+						themefile.ignore(SSmax, '\n');
+						continue;
+					}
 					themefile.ignore(SSmax, '[');
 					if (themefile.eof()) break;
 					string name, value;
 					getline(themefile, name, ']');
 					if (not Default_theme.contains(name)) {
+						themefile.ignore(SSmax, '\n');
 						continue;
 					}
 					themefile.ignore(SSmax, '=');
@@ -394,6 +399,7 @@ namespace Theme {
 					if (themefile.peek() == '"') {
 						themefile.ignore(1);
 						getline(themefile, value, '"');
+						themefile.ignore(SSmax, '\n');
 					}
 					else getline(themefile, value, '\n');
 

src/linux/btop_collect.cpp

@@ -448,7 +448,7 @@ namespace Cpu {
 						const int file_id = atoi(file.path().filename().c_str() + 4); // skip "temp" prefix
 						string file_path = file.path();
 
-						if (!s_contains(file_path, file_suffix)) {
+						if (!s_contains(file_path, file_suffix) or s_contains(file_path, "nvme")) {
 							continue;
 						}