4 files changed, 10 insertions, 12 deletions

diff --git a/manual/configure_rockbox/general_settings.tex b/manual/configure_rockbox/general_settings.tex
index 2a95bd92d4..11323d061c 100755
--- a/manual/configure_rockbox/general_settings.tex
+++ b/manual/configure_rockbox/general_settings.tex
@@ -1,5 +1,3 @@
-  \begin{center}
-    \includegraphics[width=4cm]{configure_rockbox/images/ss-general-settings-\genericimg.png}
-  \end{center}
+\screenshot{configure_rockbox/images/ss-general-settings-\genericimg.png}{}{}
 
-  
\ No newline at end of file
+  
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index c9510a78ea..f69fc80aaa 100755
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -1,6 +1,4 @@
-\begin{center}
-  \includegraphics[width=4cm]{configure_rockbox/images/ss-sound-settings-\genericimg.png}
-\end{center}
+\screenshot{configure_rockbox/images/ss-sound-settings-\genericimg.png}{}{}
 
 The Sound Settings menu offers a selection of sound properties you may change to customize your listening experience.
 
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 138d9830ec..fb6fdc2a54 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -92,8 +92,10 @@
 \newcommand{\screenshot}[3]{
   \begin{figure}[!ht]
     \begin{center}
-      \includegraphics[width=4cm]{#1}
-      \if\blank{#3}\else{\label{#3}}\fi\if\blank{#2}\else{
+      \IfFileExists{#1}{\includegraphics[width=4cm]{#1}}{%
+        \typeout{Missing image: #1}%
+        \color{red}{\textbf{WARNING!} Image not found}}%
+      \if\blank{#3}\else{\label{#3}}\fi\if\blank{#2}\else{%
         \caption{#2}}\fi
     \end{center}
   \end{figure}
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 81c5447416..92040cdc00 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -137,7 +137,7 @@ following options:
 \end{description}
 
 \subsection{\label{ref:Playlistsubmenu}Playlist Submenu}
-\screenshot{rockbox_interface/images/ss-playlist-menu-112x64x1.png}{The playlist menu}{}
+\screenshot{rockbox_interface/images/ss-playlist-menu-\genericimg.png}{The playlist menu}{}
 If the playlist submenu is invoked on a directory, it will act on all the files
 within that directory.  If invoked on a playlist it will act on all the files
 in that playlist. Otherwise it acts only on the current file.
@@ -170,7 +170,7 @@ and then play is started.\\
 \note{The dynamic playlist is saved so resume will restore it exactly as before shutdown.}
 
 \subsection{Virtual Keyboard}
-\screenshot{rockbox_interface/images/ss-virtual-keyboard-112x64x1.png}{The virtual keyboard}{}
+\screenshot{rockbox_interface/images/ss-virtual-keyboard-\genericimg.png}{The virtual keyboard}{}
 This is the virtual keyboard that is used when entering file names in Rockbox.
 
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,RECORDER_PAD,IPOD_4G_PAD}{
@@ -429,7 +429,7 @@ Notes:
 }
 
 \subsection{\label{ref:ID3viewer}ID3 Viewer}
-\screenshot{rockbox_interface/images/ss-id3-viewer-112x64x1.png}{The ID3 viewer}{}
+\screenshot{rockbox_interface/images/ss-id3-viewer-\genericimg.png}{The ID3 viewer}{}
 This screen is accessible from the WPS screen, and provides a detailed view of
 all the identity information about the current track. This info is known as
 meta data and is stored in audio file formats to keep information on artist,