From e3b67b2985b837c0f1933916dee5fe5533ecfed9 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 9 Feb 2015 22:06:33 -0500
Subject: [PATCH] Use short plugin name in error messages when possible

---
 library/PluginManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp
index ce4dcae96..ea919dc61 100644
--- a/library/PluginManager.cpp
+++ b/library/PluginManager.cpp
@@ -241,7 +241,7 @@ bool Plugin::load(color_ostream &con)
     std::vector<std::string>** plugin_globals_ptr = (std::vector<std::string>**) LookupPlugin(plug, "plugin_globals");
     if(!plugin_init || !plugin_globals_ptr)
     {
-        con.printerr("Plugin %s has no init function or globals vector.\n", filename.c_str());
+        con.printerr("Plugin %s has no init function or globals vector.\n", *plug_name);
         ClosePlugin(plug);
         state = PS_BROKEN;
         return false;
@@ -286,7 +286,7 @@ bool Plugin::load(color_ostream &con)
     }
     else
     {
-        con.printerr("Plugin %s has failed to initialize properly.\n", filename.c_str());
+        con.printerr("Plugin %s has failed to initialize properly.\n", name.c_str());
         plugin_is_enabled = 0;
         plugin_onupdate = 0;
         reset_lua();