X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FXMMS2%2FNotifier.pm;h=55a9653553a41e3700af0fd61cb8efe79c459df4;hb=bc8efcf23b9d6a93de6fb44520cea31031cc5b99;hp=f61a74aee26ddb10934cc2e0ddd329d27a691b3f;hpb=f4385cf2da40d688c5139382567817070f5fe70f;p=app-xmms2-notifier.git

diff --git a/lib/App/XMMS2/Notifier.pm b/lib/App/XMMS2/Notifier.pm
index f61a74a..55a9653 100644
--- a/lib/App/XMMS2/Notifier.pm
+++ b/lib/App/XMMS2/Notifier.pm
@@ -1,5 +1,5 @@
 package App::XMMS2::Notifier;
-use v5.14;
+use 5.014000;
 use strict;
 use warnings;
 our $VERSION = 0.001001;
@@ -25,12 +25,15 @@ sub notify_libnotify{
 }
 
 sub notify{
-	my $id=$xmms->playback_current_id->wait->value or return;
-	my $minfo=$xmms->medialib_get_info($id)->wait->value;
+	my ($id, $minfo);
+	eval {
+		$id=$xmms->playback_current_id->wait->value or return;
+		$minfo=$xmms->medialib_get_info($id)->wait->value;
+	} or return;
 
-	my %metadata = map { $_ => exists $minfo->{$_} ? (values $minfo->{$_})[0] : undef } CONVERSION_SPECIFIERS;
+	my %metadata = map { $_ => exists $minfo->{$_} ? (values %{$minfo->{$_}})[0] : undef } CONVERSION_SPECIFIERS;
 	my $str=$format;
-	$str =~ s/\$$_/$metadata{$_}/g for keys %metadata;
+	$str =~ s/\$$_/$metadata{$_}/gs for keys %metadata;
 
 	notify_libnotify $str
 }
@@ -57,8 +60,7 @@ sub run {
 	$xmms->loop
 }
 
-1
-
+1;
 __END__
 
 =head1 NAME