Merge branch 'master' into object-oriented

src/core/Statsgen.cpp

@@ -308,15 +308,10 @@ void* generate_stats_thread(void* threadarg) {
 	string password;
 	uint64_t nbPasswords;
 
-	// fast-forward to beginning of work
-	while(nbline < my_data->lineBegin){
-		readfile.ignore('\n');
-		readfile.get();
-		++nbline;
-	}
-
-	while(nbline < my_data->lineEnd && readfile >> line) {
+	while(readfile >> line){
 		++nbline;
+		if (nbline < my_data->lineBegin){ continue; }
+		if (nbline > my_data->lineEnd){ break; }
 		if (line.size() == 0){ continue; }
 
 		if (my_data->withcount) {