From 05cf190a8a065165a83ed876f4de1c44dc4bb3bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gaier?= <Bjoern.Gaier@horiba.com>
Date: Fri, 7 Oct 2022 16:20:08 +0200
Subject: [PATCH] Return iterator instead of dir

---
 src/Tools/psxcdgen_ex/src/main.rs           | 2 +-
 src/Tools/psxcdgen_ex/src/types/iterator.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Tools/psxcdgen_ex/src/main.rs b/src/Tools/psxcdgen_ex/src/main.rs
index 570e09a7..fefaf377 100644
--- a/src/Tools/psxcdgen_ex/src/main.rs
+++ b/src/Tools/psxcdgen_ex/src/main.rs
@@ -27,7 +27,7 @@ fn run_main() -> Result<(), Error> {
             match element {
                 DirectoryIteratorElement::Root(root)     => println!("{}", root),
                 DirectoryIteratorElement::Data(data)     => println!("{}", data),
-                DirectoryIteratorElement::Directory(dir) => dump_dir(dir.iter()),
+                DirectoryIteratorElement::Directory(dir) => dump_dir(dir),
             }
         }
 
diff --git a/src/Tools/psxcdgen_ex/src/types/iterator.rs b/src/Tools/psxcdgen_ex/src/types/iterator.rs
index f5ad3b90..547f3d6c 100644
--- a/src/Tools/psxcdgen_ex/src/types/iterator.rs
+++ b/src/Tools/psxcdgen_ex/src/types/iterator.rs
@@ -34,7 +34,7 @@ impl<'a> std::iter::Iterator for DirectoryIterator<'a> {
             DirectoryIteratorState::Directory(mut iter) => {
                 if let Some(dir) = iter.next() {
                     self.state = DirectoryIteratorState::Directory(iter);
-                    return Some(DirectoryIteratorElement::Directory(dir));
+                    return Some(DirectoryIteratorElement::Directory(dir.iter()));
                 }
 
                 else {
@@ -58,5 +58,5 @@ enum DirectoryIteratorState<'a> {
 pub enum DirectoryIteratorElement<'a> {
     Root(&'a Directory),
     Data(&'a Data),
-    Directory(&'a Directory),
+    Directory(DirectoryIterator<'a>),
 }
\ No newline at end of file