code cleanup

1 files changed, 10 insertions, 6 deletions

diff --git a/src/commands/file_ops.rs b/src/commands/file_ops.rs
index 71012f9..19b13b6 100644
--- a/src/commands/file_ops.rs
+++ b/src/commands/file_ops.rs
@@ -47,21 +47,25 @@ pub fn paste(context: &mut JoshutoContext, options: IOWorkerOptions) -> JoshutoR
 
 #[cfg(feature = "clipboard")]
 pub fn copy_filename(context: &mut JoshutoContext) -> JoshutoResult<()> {
-    if let Some(entry) = context
+    let entry_file_name = match context
         .tab_context_ref()
         .curr_tab_ref()
         .curr_list_ref()
         .and_then(|c| c.curr_entry_ref())
     {
-        let ret = match cli_clipboard::set_contents(entry.file_name().to_string()) {
+        Some(entry) => Some(entry.file_name().to_string()),
+        None => None,
+    };
+    if let Some(content) = entry_file_name {
+        let ret = match cli_clipboard::set_contents(content.clone()) {
+            Ok(_) => {
+                context.push_msg(format!("Copied '{}' to clipboard", content.as_str()));
+                Ok(())
+            }
             Err(e) => Err(JoshutoError::new(
                 JoshutoErrorKind::ClipboardError,
                 format!("{:?}", e),
             )),
-            s => {
-                context.push_msg(format!("Copied '{}' to clipboard", entry.file_name()));
-                Ok(())
-            }
         };
         return ret;
     }