X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=1db6b2d0fac0082d65b0a1d3129efb36a9441d7d;hb=53a0a3879cf00cfd91f8dc7860a143e4764d9952;hp=af48c6bbfa1167041a91424a55700fde00cbb084;hpb=735348835742771e33e547d2f3d0a16ce81db32a;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index af48c6bbf..1db6b2d0f 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -427,8 +427,8 @@ public:
 				);
 		}
 
-		for (list<string>::const_iterator i = notes.begin(); i != notes.end(); ++i) {
-			error_dialog (0, std_to_wx (*i));
+		BOOST_FOREACH (string i, notes) {
+			error_dialog (0, std_to_wx(i));
 		}
 
 		set_film (film);
@@ -1022,14 +1022,16 @@ private:
 			string body;
 			body += d->name() + "\n";
 			body += d->language() + "\n";
+			body += string(dcpomatic_version) + " " + string(dcpomatic_git_commit) + "\n";
+			body += "--\n";
 			map<string, string> translations = I18NHook::translations ();
 			for (map<string, string>::const_iterator i = translations.begin(); i != translations.end(); ++i) {
-				body += i->first + "\n" + i->second + "\n";
+				body += i->first + "\n" + i->second + "\n\n";
 			}
 			list<string> to;
 			to.push_back ("carl@dcpomatic.com");
 			Emailer emailer (d->email(), to, "DCP-o-matic translations", body);
-			emailer.send ("main.carlh.net", 2525);
+			emailer.send ("main.carlh.net", 2525, EMAIL_PROTOCOL_STARTTLS);
 		}
 
 		d->Destroy ();
@@ -1326,6 +1328,8 @@ private:
 
 		int pos = _history_position;
 
+		/* Clear out non-existant history items before we re-build the menu */
+		Config::instance()->clean_history ();
 		vector<boost::filesystem::path> history = Config::instance()->history ();
 
 		if (!history.empty ()) {
@@ -1343,6 +1347,8 @@ private:
 		}
 
 		_history_items = history.size ();
+
+		dcpomatic_log->set_types (Config::instance()->log_types());
 	}
 
 	void update_checker_state_changed ()