summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Cargo.toml2
-rw-r--r--src/lib.rs9
2 files changed, 7 insertions, 4 deletions
diff --git a/Cargo.toml b/Cargo.toml
index a825e2b..341299a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hexchat-plugin"
-version = "0.2.4"
+version = "0.2.5"
 authors = ["SoniEx2 <endermoneymod@gmail.com>"]
 description = "Lets you write HexChat plugins in Rust"
 license = "AGPL-3.0+"
diff --git a/src/lib.rs b/src/lib.rs
index 1b9ffec..9959dc7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -434,9 +434,10 @@ impl PluginHandle {
         unsafe {
             let info = self.info;
             if !(*info.name).is_null() || !(*info.desc).is_null() || !(*info.vers).is_null() {
+                std::str::from_utf8_unchecked(CStr::from_ptr(*info.name).to_bytes())
+            } else {
                 panic!("Attempt to get the name of a plugin that was not yet registered.");
             }
-            std::str::from_utf8_unchecked(CStr::from_ptr(*info.name).to_bytes())
         }
     }
 
@@ -449,9 +450,10 @@ impl PluginHandle {
         unsafe {
             let info = self.info;
             if !(*info.name).is_null() || !(*info.desc).is_null() || !(*info.vers).is_null() {
+                std::str::from_utf8_unchecked(CStr::from_ptr(*info.desc).to_bytes())
+            } else {
                 panic!("Attempt to get the description of a plugin that was not yet registered.");
             }
-            std::str::from_utf8_unchecked(CStr::from_ptr(*info.desc).to_bytes())
         }
     }
 
@@ -464,9 +466,10 @@ impl PluginHandle {
         unsafe {
             let info = self.info;
             if !(*info.name).is_null() || !(*info.desc).is_null() || !(*info.vers).is_null() {
+                std::str::from_utf8_unchecked(CStr::from_ptr(*info.vers).to_bytes())
+            } else {
                 panic!("Attempt to get the version of a plugin that was not yet registered.");
             }
-            std::str::from_utf8_unchecked(CStr::from_ptr(*info.vers).to_bytes())
         }
     }