diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-10-17 18:30:09 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-10-17 18:30:09 +0200 |
| commit | 6ec4b3d31080f90393e72989d559cfb76eff6f9d (patch) | |
| tree | b01e816c3419d479a81b83273fe6136a6ba9d361 | |
| parent | 9520a1a101b264abe700c3f7753f5f55bba4c681 (diff) | |
| download | Melon-6ec4b3d31080f90393e72989d559cfb76eff6f9d.tar.gz Melon-6ec4b3d31080f90393e72989d559cfb76eff6f9d.zip | |
Nothing, really
| -rw-r--r-- | Source/Kernel/Makefile | 2 | ||||
| -rw-r--r-- | Source/Kernel/VTManager/SimpleVT.class.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/Kernel/Makefile b/Source/Kernel/Makefile index 118ea29..56754d0 100644 --- a/Source/Kernel/Makefile +++ b/Source/Kernel/Makefile @@ -5,7 +5,7 @@ CXX = g++ LD = ld LDFLAGS = -T Link.ld -Map Map.txt --oformat=elf32-i386 CFLAGS = -nostdlib -nostartfiles -nodefaultlibs -fno-builtin -fno-stack-protector -Wall -Wextra -Werror -I . -CXXFLAGS = -nostartfiles -nostdlib -fno-exceptions -fno-rtti -I . -Wall -Werror -Wno-write-strings -funsigned-char -D THIS_IS_MELON -D RANDOM_SEED=1`date +%N`LL -g +CXXFLAGS = -nostartfiles -nostdlib -fno-exceptions -fno-rtti -I . -Wall -Werror -Wno-write-strings -funsigned-char -D THIS_IS_MELON -D RANDOM_SEED=1`date +%N`LL ASM = nasm ASMFLAGS = -f elf diff --git a/Source/Kernel/VTManager/SimpleVT.class.cpp b/Source/Kernel/VTManager/SimpleVT.class.cpp index 9639d50..89391b2 100644 --- a/Source/Kernel/VTManager/SimpleVT.class.cpp +++ b/Source/Kernel/VTManager/SimpleVT.class.cpp @@ -82,6 +82,7 @@ void SimpleVT::scroll() { } void SimpleVT::updateCursor() { + if (!m_mapped) return; Disp::moveCursor(m_csrlin + m_maprow, m_csrcol + m_mapcol); } @@ -126,7 +127,7 @@ void SimpleVT::put(WChar c, bool updatecsr) { scroll(); m_csrlin--; } - if (updatecsr) updateCursor(); + if (updatecsr && m_mapped) updateCursor(); } void SimpleVT::hexDump(u8int *ptr, u32int sz, bool addnl) { |